From 9158d035af3ab866c62b7825ad332b74191d5ef2 Mon Sep 17 00:00:00 2001 From: Doesnty Date: Wed, 2 Aug 2017 14:18:39 -0500 Subject: Improve battle_4 --- data/battle_scripts_1.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 0945d75c8..e046794b3 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3485,7 +3485,7 @@ BattleScript_PerishSongTimerGoesDown:: @ 81D921D waitmessage 64 end2 -gUnknown_081D9224:: @ 81D9224 +BattleScript_AllStatsUp:: @ 81D9224 jumpifstat USER, 3, 1, 12, BattleScript_1D9251 jumpifstat USER, 3, 2, 12, BattleScript_1D9251 jumpifstat USER, 3, 3, 12, BattleScript_1D9251 @@ -3659,7 +3659,7 @@ BattleScript_1D93EC: @ 81D93EC waitmessage 64 jump BattleScript_EndTurn -gUnknown_081D93FA:: @ 81D93FA +BattleScript_AtkDefDown:: @ 81D93FA setbyte 0x20160dc, 0 playstatchangeanimation USER, 6, 13 playstatchangeanimation USER, 2, 9 @@ -3731,7 +3731,7 @@ BattleScript_OneHitKOMsg:: @ 81D94A9 waitmessage 64 return -gUnknown_081D94B0:: @ 81D94B0 +BattleScript_SAtkDown2:: @ 81D94B0 setbyte 0x20160dc, 0 playstatchangeanimation USER, 16, 11 setbyte 0x201601e, 164 -- cgit v1.2.3 From 04110a7040ae2a93505812fbb215bc52fdaf0e95 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 13 Aug 2017 17:55:25 -0500 Subject: decompile nullsub_91 - sub_802C2EC --- data/data2b.s | 65 ----------------------------------------------------------- 1 file changed, 65 deletions(-) (limited to 'data') diff --git a/data/data2b.s b/data/data2b.s index 5fb3fa982..4c6996c8f 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -3,71 +3,6 @@ .section .rodata - .string "ターン$" @ "turn" - - .align 2 -gPlayerBufferCommands:: @ 81FAD98 - .4byte PlayerHandleGetAttributes - .4byte sub_802ECF0 - .4byte PlayerHandleSetAttributes - .4byte sub_802F7CC - .4byte PlayerHandleLoadPokeSprite - .4byte PlayerHandleSendOutPoke - .4byte PlayerHandleReturnPokeToBall - .4byte PlayerHandleTrainerThrow - .4byte PlayerHandleTrainerSlide - .4byte PlayerHandleTrainerSlideBack - .4byte sub_802FE7C - .4byte sub_802FF60 - .4byte sub_802FF80 - .4byte PlayerHandleBallThrow - .4byte PlayerHandlePuase - .4byte PlayerHandleMoveAnimation - .4byte PlayerHandlePrintString - .4byte PlayerHandlePrintStringPlayerOnly - .4byte sub_803037C - .4byte nullsub_42 - .4byte sub_8030468 - .4byte PlayerHandleOpenBag - .4byte sub_8030594 - .4byte sub_8030674 - .4byte PlayerHandleHealthBarUpdate - .4byte PlayerHandleExpBarUpdate - .4byte PlayerHandleStatusIconUpdate - .4byte PlayerHandleStatusAnimation - .4byte PlayerHandleStatusXor - .4byte sub_803097C - .4byte PlayerHandleDMATransfer - .4byte sub_8030A3C - .4byte sub_8030A6C - .4byte sub_8030A78 - .4byte sub_8030A8C - .4byte sub_8030AA0 - .4byte sub_8030AB4 - .4byte sub_8030AC8 - .4byte sub_8030AE4 - .4byte sub_8030B1C - .4byte sub_8030B34 - .4byte PlayerHandleHitAnimation - .4byte sub_8030BCC - .4byte PlayerHandleEffectivenessSound - .4byte sub_8030C1C - .4byte PlayerHandleFaintingCry - .4byte PlayerHandleIntroSlide - .4byte PlayerHandleTrainerBallThrow - .4byte sub_8030FAC - .4byte sub_80310A4 - .4byte sub_80310F0 - .4byte PlayerHandleSpriteInvisibility - .4byte PlayerHandleBattleAnimation - .4byte PlayerHandleLinkStandbyMsg - .4byte PlayerHandleResetActionMoveSelection - .4byte sub_80312A0 - .4byte nullsub_43 - -gUnknown_081FAE7C:: @ 81FAE7C - .byte 0, 2, 3, 1 - gUnknown_081FAE80:: @ 81FAE80 .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW WHITE LIGHT_BLUE WHITE2}$" -- cgit v1.2.3 From be40e2196a84f0e6c3a5fb47829f52a88bd55937 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 14 Aug 2017 23:39:08 +0200 Subject: all data moved from asm to c --- data/mon_pokeblock_anims.inc | 133 ------------------------- data/pokeblock_feed.s | 225 ------------------------------------------- 2 files changed, 358 deletions(-) delete mode 100644 data/mon_pokeblock_anims.inc delete mode 100644 data/pokeblock_feed.s (limited to 'data') diff --git a/data/mon_pokeblock_anims.inc b/data/mon_pokeblock_anims.inc deleted file mode 100644 index d8df29c1d..000000000 --- a/data/mon_pokeblock_anims.inc +++ /dev/null @@ -1,133 +0,0 @@ -gNatureToMonPokeblockAnim:: @ 8411A10 - .byte 0, 0 @ HARDY - .byte 3, 0 @ LONELY - .byte 4, 1 @ BRAVE - .byte 5, 0 @ ADAMANT - .byte 10, 0 @ NAUGHTY - .byte 13, 0 @ BOLD - .byte 15, 0 @ DOCILE - .byte 16, 2 @ RELAXED - .byte 18, 0 @ IMPISH - .byte 19, 0 @ LAX - .byte 20, 0 @ TIMID - .byte 25, 0 @ HASTY - .byte 27, 3 @ SERIOUS - .byte 28, 0 @ JOLLY - .byte 29, 0 @ NAIVE - .byte 33, 4 @ MODEST - .byte 36, 0 @ MILD - .byte 37, 0 @ QUIET - .byte 39, 0 @ BASHFUL - .byte 42, 0 @ RASH - .byte 45, 0 @ CALM - .byte 46, 5 @ GENTLE - .byte 47, 6 @ SASSY - .byte 48, 0 @ CAREFUL - .byte 53, 0 @ QUIRKY - - .align 1 -gMonPokeblockAnims:: @ 8411A42 - @ HARDY - .2byte 0, 4, 0, 8, 24, 0, 0, 0, 12, 0 - .2byte 0, 4, 0, 16, 24, 0, 0, 0, 12, 0 - .2byte 0, 4, 0, 32, 32, 0, 0, 0, 16, 1 - - @ LONELY - .2byte 0, 3, 6, 0, 48, 0, 0, 0, 24, 1 - - @ BRAVE - .2byte 64, 16, -24, 0, 32, 0, 0, 0, 0, 1 - - @ ADAMANT - .2byte 0, 4, 8, 0, 16, 0, -8, 0, 0, 0 - .2byte 0, 0, 0, 0, 16, 0, 0, 0, 0, 0 - .2byte 0, 4, 8, 0, 16, 0, -8, 0, 0, 0 - .2byte 0, 0, 0, 0, 16, 0, 0, 0, 0, 0 - .2byte 0, 4, -16, 0, 4, 0, 16, 0, 0, 1 - - @ NAUGHTY - .2byte 0, 3, 6, 0, 12, 0, 0, 0, 6, 0 - .2byte 0, 3, -6, 0, 12, 0, 0, 0, 6, 0 - .2byte 0, 16, 16, 0, 45, 1, 0, 0, 0, 1 - - @ BOLD - .2byte 0, 16, 0, 24, 32, 0, 0, 0, 16, 0 - .2byte 0, 16, 0, 23, 32, 0, 0, 0, 16, 1 - - @ DOCILE - .2byte 0, 0, 0, 0, 80, 0, 0, 0, 0, 1 - - @ RELAXED - .2byte 0, 2, 8, 0, 32, 0, 0, 0, 0, 0 - .2byte 0, 2, -8, 0, 32, 0, 0, 0, 0, 1 - - @ IMPISH - .2byte 0, 32, 2, 1, 48, 1, 0, 0, 24, 1 - - @ LAX - .2byte 0, 2, 16, 16, 128, 0, 0, 0, 0, 1 - - @ TIMID - .2byte 0, 2, -8, 0, 48, 0, -24, 0, 0, 0 - .2byte 0, 0, 0, 0, 8, 0, 0, 0, 0, 0 - .2byte 64, 32, 2, 0, 36, 0, 0, 0, 0, 0 - .2byte 0, 0, 0, 0, 8, 0, 0, 0, 0, 0 - .2byte 0, 2, 8, 0, 48, 0, 24, 0, 0, 1 - - @ HASTY - .2byte 64, 24, 16, 0, 32, 0, 0, 0, 0, 0 - .2byte 0, 28, 2, 1, 32, 1, 0, 0, 16, 1 - - @ SERIOUS - .2byte 0, 0, 0, 0, 32, 0, 0, 0, 0, 1 - - @ JOLLY - .2byte 64, 16, -16, 2, 48, 0, 0, 0, 32, 1 - - @ NAIVE - .2byte 0, 12, -8, 4, 24, 0, 8, 0, 12, 0 - .2byte 0, 12, 8, 8, 24, 0, -16, 0, 12, 0 - .2byte 0, 12, -8, 16, 24, 0, 16, 0, 12, 0 - .2byte 0, 12, 8, 28, 24, 0, -8, 0, 12, 1 - - @ MODEST - .2byte 0, 0, 0, 0, 8, 0, 0, 0, 0, 0 - .2byte 64, 16, -4, 0, 32, 0, 0, 0, 0, 0 - .2byte 0, 0, 0, 0, 8, 0, 0, 0, 0, 1 - - @ MILD - .2byte 128, 4, 0, 8, 64, 0, 0, 0, 0, 1 - - @ QUIET - .2byte 0, 2, 16, 0, 48, 0, 0, 0, 0, 0 - .2byte 128, 2, 16, 0, 48, 0, 0, 0, 0, 1 - - @ BASHFUL - .2byte 0, 2, -4, 0, 48, 0, -48, 0, 0, 0 - .2byte 0, 0, 0, 0, 80, 0, 0, 0, 0, 0 - .2byte 0, 2, 8, 0, 24, 0, 48, 0, 0, 1 - - @ RASH - .2byte 64, 4, 64, 58, 52, 0, -88, 0, 0, 0 - .2byte 0, 0, 0, 0, 80, 0, 0, 0, 0, 0 - .2byte 0, 24, 80, 0, 32, 0, 88, 0, 0, 1 - - @ CALM - .2byte 0, 2, 16, 4, 64, 0, 0, 0, 0, 1 - - @ GENTLE - .2byte 0, 0, 0, 0, 32, 0, 0, 0, 0, 1 - - @ SASSY - .2byte 0, 0, 0, 0, 42, 0, 0, 0, 0, 1 - - @ CAREFUL - .2byte 0, 4, 0, 8, 24, 0, 0, 0, 12, 0 - .2byte 0, 0, 0, 0, 12, 0, 0, 0, 0, 0 - .2byte 0, 4, 0, 12, 24, 0, 0, 0, 12, 0 - .2byte 0, 0, 0, 0, 12, 0, 0, 0, 0, 0 - .2byte 0, 4, 0, 4, 24, 0, 0, 0, 12, 1 - - @ QUIRKY - .2byte 0, 4, 16, 12, 64, 0, 0, 0, 0, 0 - .2byte 0, -4, 16, 12, 64, 0, 0, 0, 0, 1 diff --git a/data/pokeblock_feed.s b/data/pokeblock_feed.s deleted file mode 100644 index ae5b17d12..000000000 --- a/data/pokeblock_feed.s +++ /dev/null @@ -1,225 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -@ 8411A10 - .include "data/mon_pokeblock_anims.inc" - - .align 2 -gSpriteAffineAnim_8411E90:: @ 8411E90 - obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_8411EA0:: @ 8411EA0 - obj_rot_scal_anim_frame 0x0, 0x0, 12, 1 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 30 - obj_rot_scal_anim_frame 0x0, 0x0, -12, 1 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_8411EC0:: @ 8411EC0 - obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0 - obj_rot_scal_anim_frame 0x0, 0x0, 12, 1 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 28 - obj_rot_scal_anim_frame 0x0, 0x0, -4, 3 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_8411EE8:: @ 8411EE8 - obj_rot_scal_anim_frame 0x0, 0x0, 1, 16 - obj_rot_scal_anim_frame 0x0, 0x0, -1, 32 - obj_rot_scal_anim_frame 0x0, 0x0, 1, 16 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_8411F08:: @ 8411F08 - obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0 - obj_rot_scal_anim_frame 0x0, 0x0, 1, 16 - obj_rot_scal_anim_frame 0x0, 0x0, -1, 32 - obj_rot_scal_anim_frame 0x0, 0x0, 1, 16 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_8411F30:: @ 8411F30 - obj_rot_scal_anim_frame 0x0, 0x0, -1, 8 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 16 - obj_rot_scal_anim_frame 0x0, 0x0, 1, 8 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_8411F50:: @ 8411F50 - obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0 - obj_rot_scal_anim_frame 0x0, 0x0, -1, 8 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 16 - obj_rot_scal_anim_frame 0x0, 0x0, 1, 8 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_8411F78:: @ 8411F78 - obj_rot_scal_anim_frame 0x0, 0x0, -1, 8 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 32 - obj_rot_scal_anim_frame 0x0, 0x0, 1, 8 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_8411F98:: @ 8411F98 - obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0 - obj_rot_scal_anim_frame 0x0, 0x0, -1, 8 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 32 - obj_rot_scal_anim_frame 0x0, 0x0, 1, 8 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_8411FC0:: @ 8411FC0 - obj_rot_scal_anim_frame 0x0, 0x0, -1, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 24 - obj_rot_scal_anim_frame 0x0, 0x0, 1, 4 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_8411FE0:: @ 8411FE0 - obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0 - obj_rot_scal_anim_frame 0x0, 0x0, -1, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 24 - obj_rot_scal_anim_frame 0x0, 0x0, 1, 4 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_8412008:: @ 8412008 - obj_rot_scal_anim_frame 0x0, 0x0, 1, 24 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 16 - obj_rot_scal_anim_frame 0x0, 0x0, -12, 2 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_8412028:: @ 8412028 - obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0 - obj_rot_scal_anim_frame 0x0, 0x0, 1, 24 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 16 - obj_rot_scal_anim_frame 0x0, 0x0, -12, 2 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_8412050:: @ 8412050 - .4byte gSpriteAffineAnim_8411E90 - .4byte gSpriteAffineAnim_8411EA0 - .4byte gSpriteAffineAnim_8411EE8 - .4byte gSpriteAffineAnim_8411F30 - .4byte gSpriteAffineAnim_8411F78 - .4byte gSpriteAffineAnim_8411FC0 - .4byte gSpriteAffineAnim_8412008 - .4byte gSpriteAffineAnim_8411E90 - .4byte gSpriteAffineAnim_8411E90 - .4byte gSpriteAffineAnim_8411E90 - .4byte gSpriteAffineAnim_8411E90 - .4byte gSpriteAffineAnim_8411EC0 - .4byte gSpriteAffineAnim_8411F08 - .4byte gSpriteAffineAnim_8411F50 - .4byte gSpriteAffineAnim_8411F98 - .4byte gSpriteAffineAnim_8411FE0 - .4byte gSpriteAffineAnim_8412028 - .4byte gSpriteAffineAnim_8411E90 - .4byte gSpriteAffineAnim_8411E90 - .4byte gSpriteAffineAnim_8411E90 - .4byte gSpriteAffineAnim_8411E90 - - .align 2 -gUnknown_084120A4:: @ 84120A4 - .4byte gPokeblockRed_Pal - .4byte gPokeblockBlue_Pal - .4byte gPokeblockPink_Pal - .4byte gPokeblockGreen_Pal - .4byte gPokeblockYellow_Pal - .4byte gPokeblockPurple_Pal - .4byte gPokeblockIndigo_Pal - .4byte gPokeblockBrown_Pal - .4byte gPokeblockLiteBlue_Pal - .4byte gPokeblockOlive_Pal - .4byte gPokeblockGray_Pal - .4byte gPokeblockBlack_Pal - .4byte gPokeblockWhite_Pal - .4byte gPokeblockGold_Pal - - .align 2 -gSpriteAffineAnim_84120DC:: @ 84120DC - obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_84120EC:: @ 84120EC - .4byte gSpriteAffineAnim_84120DC - - .align 2 -gSpriteAffineAnim_84120F0:: @ 84120F0 - obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0 - obj_rot_scal_anim_frame 0x0, 0x0, -8, 1 - obj_rot_scal_anim_frame 0x0, 0x0, -8, 1 - obj_rot_scal_anim_frame 0x0, 0x0, -8, 1 - obj_rot_scal_anim_frame 0x0, 0x0, -8, 1 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 8 - obj_rot_scal_anim_frame 0x0, 0x0, 16, 1 - obj_rot_scal_anim_frame 0x0, 0x0, 16, 1 - obj_rot_scal_anim_frame 0x0, 0x0, 16, 1 - obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_8412148:: @ 8412148 - obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0 - obj_rot_scal_anim_frame 0x0, 0x0, 8, 1 - obj_rot_scal_anim_frame 0x0, 0x0, 8, 1 - obj_rot_scal_anim_frame 0x0, 0x0, 8, 1 - obj_rot_scal_anim_frame 0x0, 0x0, 8, 1 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 8 - obj_rot_scal_anim_frame 0x0, 0x0, -16, 1 - obj_rot_scal_anim_frame 0x0, 0x0, -16, 1 - obj_rot_scal_anim_frame 0x0, 0x0, -16, 1 - obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_84121A0:: @ 84121A0 - .4byte gSpriteAffineAnim_84120DC - - .align 2 -gSpriteAffineAnimTable_84121A4:: @ 84121A4 - .4byte gSpriteAffineAnim_84120F0 - - .align 2 -gSpriteAffineAnimTable_84121A8:: @ 84121A8 - .4byte gSpriteAffineAnim_8412148 - - .align 2 -gOamData_84121AC:: @ 84121AC - .2byte 0x0300 - .2byte 0x0000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_84121B4:: @ 84121B4 - obj_image_anim_frame 0, 0 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_84121BC:: @ 84121BC - .4byte gSpriteAnim_84121B4 - - .align 2 -gSpriteAffineAnim_84121C0:: @ 84121C0 - obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 - obj_rot_scal_anim_frame 0xFFF8, 0xFFF8, 0, 1 - obj_rot_scal_anim_jump 1 - - .align 2 -gSpriteAffineAnimTable_84121D8:: @ 84121D8 - .4byte gSpriteAffineAnim_84121C0 - - .align 2 -gUnknown_084121DC:: @ 84121DC - obj_tiles gPokeblock_Gfx, 0x20, 14818 - - .align 2 -gSpriteTemplate_84121E4:: @ 84121E4 - spr_template 14818, 14818, gOamData_84121AC, gSpriteAnimTable_84121BC, NULL, gSpriteAffineAnimTable_84121D8, sub_81481B0 -- cgit v1.2.3 From e9ec2a1a561d3041b8df2cb512a0e03ff5bca74b Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 17 Aug 2017 21:05:59 +0200 Subject: start decompiling battle transition --- data/battle_transition.s | 122 +++++++++++++++++++++++------------------------ 1 file changed, 61 insertions(+), 61 deletions(-) (limited to 'data') diff --git a/data/battle_transition.s b/data/battle_transition.s index 0d463ddef..11d3bfe37 100644 --- a/data/battle_transition.s +++ b/data/battle_transition.s @@ -36,67 +36,67 @@ gUnknown_083FD708:: @ 83FD708 .4byte 0x0200c000 .align 2 -gUnknown_083FD70C:: @ 83FD70C - .4byte sub_811AC64 - .4byte sub_811AC64 - .4byte sub_811AC64 - .4byte sub_811AC64 - .4byte sub_811AC64 - .4byte sub_811AC64 - .4byte sub_811AC64 - .4byte sub_811AC64 - .4byte sub_811AC64 - .4byte sub_811AC64 - .4byte sub_811AC64 - .4byte sub_811AC64 - .4byte sub_811AC64 - .4byte sub_811AC64 - .4byte sub_811AC64 - .4byte sub_811AC64 - .4byte sub_811AC64 - - .align 2 -gBattleTransitionFuncs:: @ 83FD750 - .4byte sub_811ACB4 - .4byte sub_811ADAC - .4byte sub_811AF44 - .4byte sub_811B0F0 - .4byte sub_811B578 - .4byte sub_811B7E8 - .4byte sub_811BCBC - .4byte sub_811BEA0 - .4byte sub_811CA5C - .4byte sub_811CCDC - .4byte sub_811D0B8 - .4byte sub_811D1C8 - .4byte sub_811C08C - .4byte sub_811C0AC - .4byte sub_811C0CC - .4byte sub_811C0EC - .4byte sub_811C10C - - .align 2 -gUnknown_083FD794:: @ 83FD794 - .4byte sub_811AB88 - .4byte sub_811ABD8 - .4byte sub_811AC0C - .4byte sub_811AC34 - - .align 2 -gUnknown_083FD7A4:: @ 83FD7A4 - .4byte sub_811ACEC - .4byte sub_811AD1C - .4byte sub_811AD80 - - .align 2 -gUnknown_083FD7B0:: @ 83FD7B0 - .4byte sub_811ADE4 - .4byte sub_811AE70 - - .align 2 -gUnknown_083FD7B8:: @ 83FD7B8 - .4byte sub_811AF7C - .4byte sub_811B000 +sPhase1_Tasks:: @ 83FD70C + .4byte Phase1Task_TransitionAll + .4byte Phase1Task_TransitionAll + .4byte Phase1Task_TransitionAll + .4byte Phase1Task_TransitionAll + .4byte Phase1Task_TransitionAll + .4byte Phase1Task_TransitionAll + .4byte Phase1Task_TransitionAll + .4byte Phase1Task_TransitionAll + .4byte Phase1Task_TransitionAll + .4byte Phase1Task_TransitionAll + .4byte Phase1Task_TransitionAll + .4byte Phase1Task_TransitionAll + .4byte Phase1Task_TransitionAll + .4byte Phase1Task_TransitionAll + .4byte Phase1Task_TransitionAll + .4byte Phase1Task_TransitionAll + .4byte Phase1Task_TransitionAll + + .align 2 +sPhase2_Tasks:: @ 83FD750 + .4byte Phase2Task_Transition0 + .4byte Phase2Task_Transition1 + .4byte Phase2Task_Transition2 + .4byte Phase2Task_Transition3 + .4byte Phase2Task_Transition4 + .4byte Phase2Task_Transition5 + .4byte Phase2Task_Transition6 + .4byte Phase2Task_Transition7 + .4byte Phase2Task_Transition8 + .4byte Phase2Task_Transition9 + .4byte Phase2Task_Transition10 + .4byte Phase2Task_Transition11 + .4byte Phase2Task_Transition12 + .4byte Phase2Task_Transition13 + .4byte Phase2Task_Transition14 + .4byte Phase2Task_Transition15 + .4byte Phase2Task_Transition16 + + .align 2 +sMainTransitionPhases:: @ 83FD794 + .4byte Transition_Phase1 + .4byte Transition_WaitForPhase1 + .4byte Transition_Phase2 + .4byte Transition_WaitForPhase2 + + .align 2 +sPhase2_Transition0_Funcs:: @ 83FD7A4 + .4byte Phase2_Transition0_Func1 + .4byte Phase2_Transition0_Func2 + .4byte Phase2_Transition0_Func3 + + .align 2 +sPhase2_Transition1_Funcs:: @ 83FD7B0 + .4byte Phase2_Transition1_Func1 + .4byte Phase2_Transition1_Func2 + + .align 2 +sPhase2_Transition2_Funcs:: @ 83FD7B8 + .4byte Phase2_Transition2_Func1 + .4byte Phase2_Transition2_Func2 .align 2 gUnknown_083FD7C0:: @ 83FD7C0 -- cgit v1.2.3 From f25425cf7de8da73f371ab587275f45e774070a0 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 18 Aug 2017 19:42:44 +0200 Subject: started transition3 phase2 --- data/battle_transition.s | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data') diff --git a/data/battle_transition.s b/data/battle_transition.s index 11d3bfe37..975de2997 100644 --- a/data/battle_transition.s +++ b/data/battle_transition.s @@ -99,13 +99,13 @@ sPhase2_Transition2_Funcs:: @ 83FD7B8 .4byte Phase2_Transition2_Func2 .align 2 -gUnknown_083FD7C0:: @ 83FD7C0 - .4byte sub_811B128 - .4byte sub_811B1D8 - .4byte sub_811B268 - .4byte sub_811B2F4 - .4byte sub_811B380 - .4byte sub_811B3EC +sPhase2_Transition3_Funcs:: @ 83FD7C0 + .4byte Phase2_Transition3_Func1 + .4byte Phase2_Transition3_Func2 + .4byte Phase2_Transition3_Func3 + .4byte Phase2_Transition3_Func4 + .4byte Phase2_Transition3_Func5 + .4byte Phase2_Transition3_Func6 .align 2 gUnknown_083FD7D8:: @ 83FD7D8 -- cgit v1.2.3 From 3e7bdf4f5fd54676c6f965325ec5b67d3d8b3eef Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Fri, 18 Aug 2017 17:08:36 -0500 Subject: finish decompiling battle_5 --- data/data2b.s | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'data') diff --git a/data/data2b.s b/data/data2b.s index 4c6996c8f..0387b6699 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -3,25 +3,6 @@ .section .rodata -gUnknown_081FAE80:: @ 81FAE80 - .string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW WHITE LIGHT_BLUE WHITE2}$" - -gUnknown_081FAE89:: @ 81FAE89 - .byte 8, 120 - .byte 88, 120 - .byte 8, 136 - .byte 88, 136 - -gUnknown_081FAE91:: @ 81FAE91 - .byte 144, 120 - .byte 190, 120 - .byte 144, 136 - .byte 190, 136 - .byte 72, 72 - .byte 32, 90 - .byte 80, 80 - .byte 80, 88 - .align 2 gUnknown_081FAEA4:: @ 81FAEA4 obj_tiles gSmokescreenImpactTiles, 0x180, 55019 -- cgit v1.2.3 From ba11084ec89d5480eeba516d78bb6980d8e12ee4 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 19 Aug 2017 17:46:21 +0200 Subject: crazy vram shaenigans --- data/battle_transition.s | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'data') diff --git a/data/battle_transition.s b/data/battle_transition.s index 975de2997..d71fa3594 100644 --- a/data/battle_transition.s +++ b/data/battle_transition.s @@ -108,10 +108,10 @@ sPhase2_Transition3_Funcs:: @ 83FD7C0 .4byte Phase2_Transition3_Func6 .align 2 -gUnknown_083FD7D8:: @ 83FD7D8 - .4byte sub_811B5B0 - .4byte sub_811B5FC - .4byte sub_811B688 +sPhase2_Transition4_Funcs:: @ 83FD7D8 + .4byte Phase2_Transition4_Func1 + .4byte Phase2_Transition4_Func2 + .4byte Phase2_Transition4_Func3 .align 1 gUnknown_083FD7E4:: @ 83FD7E4 @@ -132,14 +132,14 @@ gUnknown_083FD7F2:: @ 83FD7F2 .2byte -8 .align 2 -gUnknown_083FD7F8:: @ 83FD7F8 - .4byte sub_811B820 - .4byte sub_811B884 - .4byte sub_811B90C - .4byte sub_811B9F0 - .4byte sub_811BA70 - .4byte sub_811BB60 - .4byte sub_811BBEC +sPhase2_Transition5_Funcs:: @ 83FD7F8 + .4byte Phase2_Transition5_Func1 + .4byte Phase2_Transition5_Func2 + .4byte Phase2_Transition5_Func3 + .4byte Phase2_Transition5_Func4 + .4byte Phase2_Transition5_Func5 + .4byte Phase2_Transition5_Func6 + .4byte Phase2_Transition5_Func7 .align 2 gUnknown_083FD814:: @ 83FD814 -- cgit v1.2.3 From c87e2d89e33b07ea9cbb9c73ecfdb95d7bc8d4b9 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 19 Aug 2017 23:10:26 +0200 Subject: cam help plox, ninja shift --- data/battle_transition.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/battle_transition.s b/data/battle_transition.s index d71fa3594..187915f92 100644 --- a/data/battle_transition.s +++ b/data/battle_transition.s @@ -142,9 +142,9 @@ sPhase2_Transition5_Funcs:: @ 83FD7F8 .4byte Phase2_Transition5_Func7 .align 2 -gUnknown_083FD814:: @ 83FD814 - .4byte sub_811BCF4 - .4byte sub_811BD60 +sPhase2_Transition6_Funcs:: @ 83FD814 + .4byte Phase2_Transition6_Func1 + .4byte Phase2_Transition6_Func2 .align 2 gUnknown_083FD81C:: @ 83FD81C -- cgit v1.2.3 From f84d0541314b043fa3ef4e2b9a56809f278787f9 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 20 Aug 2017 17:27:54 +0200 Subject: mugshots tasks done --- data/battle_transition.s | 72 ++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'data') diff --git a/data/battle_transition.s b/data/battle_transition.s index 187915f92..94b242ed3 100644 --- a/data/battle_transition.s +++ b/data/battle_transition.s @@ -69,11 +69,11 @@ sPhase2_Tasks:: @ 83FD750 .4byte Phase2Task_Transition9 .4byte Phase2Task_Transition10 .4byte Phase2Task_Transition11 - .4byte Phase2Task_Transition12 - .4byte Phase2Task_Transition13 - .4byte Phase2Task_Transition14 - .4byte Phase2Task_Transition15 - .4byte Phase2Task_Transition16 + .4byte Phase2Task_Transition_Sydney + .4byte Phase2Task_Transition_Phoebe + .4byte Phase2Task_Transition_Glacia + .4byte Phase2Task_Transition_Drake + .4byte Phase2Task_Transition_Steven .align 2 sMainTransitionPhases:: @ 83FD794 @@ -147,23 +147,23 @@ sPhase2_Transition6_Funcs:: @ 83FD814 .4byte Phase2_Transition6_Func2 .align 2 -gUnknown_083FD81C:: @ 83FD81C - .4byte sub_811BED8 - .4byte sub_811BF2C - .4byte sub_811BFC4 +sPhase2_Transition7_Funcs:: @ 83FD81C + .4byte Phase2_Transition7_Func1 + .4byte Phase2_Transition7_Func2 + .4byte Phase2_Transition7_Func3 .align 2 -gUnknown_083FD828:: @ 83FD828 - .4byte sub_811C164 - .4byte sub_811C1CC - .4byte sub_811C2A4 - .4byte sub_811C38C - .4byte sub_811C400 - .4byte sub_811C43C - .4byte sub_811C4F0 - .4byte sub_811C5B4 - .4byte sub_811C5E8 - .4byte sub_811C630 +sPhase2_Mugshot_Transition_Funcs:: @ 83FD828 + .4byte Phase2_Mugshot_Func1 + .4byte Phase2_Mugshot_Func2 + .4byte Phase2_Mugshot_Func3 + .4byte Phase2_Mugshot_Func4 + .4byte Phase2_Mugshot_Func5 + .4byte Phase2_Mugshot_Func6 + .4byte Phase2_Mugshot_Func7 + .4byte Phase2_Mugshot_Func8 + .4byte Phase2_Mugshot_Func9 + .4byte Phase2_Mugshot_Func10 gUnknown_083FD850:: @ 83FD850 .byte TRAINER_PIC_SIDNEY @@ -342,45 +342,45 @@ gFieldEffectObjectPaletteInfo10:: @ 83FDA18 obj_pal gFieldEffectObjectPalette10, 0x1009 .align 2 -Unknown_83FDA20: +sMugshotPal_Sydney: .incbin "graphics/battle_transitions/sidney_bg.gbapal" .align 2 -Unknown_83FDA40: +sMugshotPal_Phoebe: .incbin "graphics/battle_transitions/phoebe_bg.gbapal" .align 2 -Unknown_83FDA60: +sMugshotPal_Glacia: .incbin "graphics/battle_transitions/glacia_bg.gbapal" .align 2 -Unknown_83FDA80: +sMugshotPal_Drake: .incbin "graphics/battle_transitions/drake_bg.gbapal" .align 2 -Unknown_83FDAA0: +sMugshotPal_Steven: .incbin "graphics/battle_transitions/steven_bg.gbapal" .align 2 -Unknown_83FDAC0: +sMugshotPal_Brendan: .incbin "graphics/battle_transitions/brendan_bg.gbapal" .align 2 -Unknown_83FDAE0: +sMugshotPal_May: .incbin "graphics/battle_transitions/may_bg.gbapal" .align 2 -gUnknown_083FDB00:: @ 83FDB00 - .4byte Unknown_83FDA20 - .4byte Unknown_83FDA40 - .4byte Unknown_83FDA60 - .4byte Unknown_83FDA80 - .4byte Unknown_83FDAA0 +sOpponentMugshotsPals:: @ 83FDB00 + .4byte sMugshotPal_Sydney + .4byte sMugshotPal_Phoebe + .4byte sMugshotPal_Glacia + .4byte sMugshotPal_Drake + .4byte sMugshotPal_Steven .align 2 -gUnknown_083FDB14:: @ 83FDB14 - .4byte Unknown_83FDAC0 - .4byte Unknown_83FDAE0 +sPlayerMugshotsPals:: @ 83FDB14 + .4byte sMugshotPal_Brendan + .4byte sMugshotPal_May .align 2 UnusedTrainerPalette: -- cgit v1.2.3 From 169714a6d4f2fcaef2f55baf6954620f8b9655e7 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 20 Aug 2017 21:32:41 +0200 Subject: mugshots done, moved some data to C --- data/battle_transition.s | 78 ++---------------------------------------------- 1 file changed, 3 insertions(+), 75 deletions(-) (limited to 'data') diff --git a/data/battle_transition.s b/data/battle_transition.s index 94b242ed3..ae69888d1 100644 --- a/data/battle_transition.s +++ b/data/battle_transition.s @@ -3,79 +3,7 @@ .section .rodata - .align 2 -gUnknown_083FBB88:: @ 83FBB88 - .incbin "graphics/battle_transitions/big_pokeball.4bpp" - - .align 2 -gUnknown_083FC108:: @ 83FC108 - .incbin "graphics/battle_transitions/pokeball_trail.4bpp" - - .align 2 -gSpriteImage_83FC148:: @ 83FC148 - .incbin "graphics/battle_transitions/pokeball.4bpp" - - .align 2 -gUnknown_083FC348:: @ 83FC348 - .incbin "graphics/battle_transitions/elite_four_bg.4bpp" - - .align 2 -gSpriteImage_83FC528:: @ 83FC528 - .incbin "graphics/battle_transitions/unused_brendan.4bpp" - - .align 2 -gSpriteImage_83FCD28:: @ 83FCD28 - .incbin "graphics/battle_transitions/unused_lass.4bpp" - - .align 2 -gUnknown_083FD528:: @ 83FD528 - .incbin "graphics/battle_transitions/shrinking_box.4bpp" - - .align 2 -gUnknown_083FD708:: @ 83FD708 - .4byte 0x0200c000 - .align 2 -sPhase1_Tasks:: @ 83FD70C - .4byte Phase1Task_TransitionAll - .4byte Phase1Task_TransitionAll - .4byte Phase1Task_TransitionAll - .4byte Phase1Task_TransitionAll - .4byte Phase1Task_TransitionAll - .4byte Phase1Task_TransitionAll - .4byte Phase1Task_TransitionAll - .4byte Phase1Task_TransitionAll - .4byte Phase1Task_TransitionAll - .4byte Phase1Task_TransitionAll - .4byte Phase1Task_TransitionAll - .4byte Phase1Task_TransitionAll - .4byte Phase1Task_TransitionAll - .4byte Phase1Task_TransitionAll - .4byte Phase1Task_TransitionAll - .4byte Phase1Task_TransitionAll - .4byte Phase1Task_TransitionAll - - .align 2 -sPhase2_Tasks:: @ 83FD750 - .4byte Phase2Task_Transition0 - .4byte Phase2Task_Transition1 - .4byte Phase2Task_Transition2 - .4byte Phase2Task_Transition3 - .4byte Phase2Task_Transition4 - .4byte Phase2Task_Transition5 - .4byte Phase2Task_Transition6 - .4byte Phase2Task_Transition7 - .4byte Phase2Task_Transition8 - .4byte Phase2Task_Transition9 - .4byte Phase2Task_Transition10 - .4byte Phase2Task_Transition11 - .4byte Phase2Task_Transition_Sydney - .4byte Phase2Task_Transition_Phoebe - .4byte Phase2Task_Transition_Glacia - .4byte Phase2Task_Transition_Drake - .4byte Phase2Task_Transition_Steven - - .align 2 sMainTransitionPhases:: @ 83FD794 .4byte Transition_Phase1 .4byte Transition_WaitForPhase1 @@ -165,7 +93,7 @@ sPhase2_Mugshot_Transition_Funcs:: @ 83FD828 .4byte Phase2_Mugshot_Func9 .4byte Phase2_Mugshot_Func10 -gUnknown_083FD850:: @ 83FD850 +sMugshotsTrainerPicIDsTable:: @ 83FD850 .byte TRAINER_PIC_SIDNEY .byte TRAINER_PIC_PHOEBE .byte TRAINER_PIC_GLACIA @@ -173,7 +101,7 @@ gUnknown_083FD850:: @ 83FD850 .byte TRAINER_PIC_STEVEN .align 1 -gUnknown_083FD856:: @ 83FD856 +sMugshotsOpponentRotationScales:: @ 83FD856 .2byte 0x200, 0x200 .2byte 0x200, 0x200 .2byte 0x1B0, 0x1B0 @@ -181,7 +109,7 @@ gUnknown_083FD856:: @ 83FD856 .2byte 0x188, 0x188 .align 1 -gUnknown_083FD86A:: @ 83FD86A +sMugshotsOpponentCoords:: @ 83FD86A .2byte 0, 0 .2byte 0, 0 .2byte -4, 4 -- cgit v1.2.3 From a5b770a5112914468158842885b0b37f5425c887 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 20 Aug 2017 23:12:00 +0200 Subject: some more functions --- data/battle_transition.s | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'data') diff --git a/data/battle_transition.s b/data/battle_transition.s index ae69888d1..95f5c4737 100644 --- a/data/battle_transition.s +++ b/data/battle_transition.s @@ -4,13 +4,6 @@ .section .rodata -sMainTransitionPhases:: @ 83FD794 - .4byte Transition_Phase1 - .4byte Transition_WaitForPhase1 - .4byte Transition_Phase2 - .4byte Transition_WaitForPhase2 - - .align 2 sPhase2_Transition0_Funcs:: @ 83FD7A4 .4byte Phase2_Transition0_Func1 .4byte Phase2_Transition0_Func2 @@ -135,10 +128,10 @@ gUnknown_083FD8A0:: @ 83FD8A0 .2byte -1, 1 .align 2 -gUnknown_083FD8A4:: @ 83FD8A4 - .4byte sub_811CA94 - .4byte sub_811CB20 - .4byte sub_811CBE8 +sPhase2_Transition8_Funcs:: @ 83FD8A4 + .4byte Phase2_Transition8_Func1 + .4byte Phase2_Transition8_Func2 + .4byte Phase2_Transition8_Func3 .align 2 gUnknown_083FD8B0:: @ 83FD8B0 -- cgit v1.2.3 From a10592da1afeec6945e31f8321b94990c503e937 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 21 Aug 2017 21:11:42 +0200 Subject: transition main functions are done --- data/battle_transition.s | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'data') diff --git a/data/battle_transition.s b/data/battle_transition.s index 95f5c4737..e15d03dd6 100644 --- a/data/battle_transition.s +++ b/data/battle_transition.s @@ -134,12 +134,12 @@ sPhase2_Transition8_Funcs:: @ 83FD8A4 .4byte Phase2_Transition8_Func3 .align 2 -gUnknown_083FD8B0:: @ 83FD8B0 - .4byte sub_811CD14 - .4byte sub_811CDA0 - .4byte sub_811CE14 - .4byte sub_811CE4C - .4byte sub_811CEB0 +sPhase2_Transition9_Funcs:: @ 83FD8B0 + .4byte Phase2_Transition9_Func1 + .4byte Phase2_Transition9_Func2 + .4byte Phase2_Transition9_Func3 + .4byte Phase2_Transition9_Func4 + .4byte Phase2_Transition9_Func5 .align 1 gUnknown_083FD8C4:: @ 83FD8C4 @@ -153,18 +153,18 @@ gUnknown_083FD8C4:: @ 83FD8C4 .2byte 5 .align 2 -gUnknown_083FD8D4:: @ 83FD8D4 - .4byte sub_811D0F0 - .4byte sub_811D144 - .4byte sub_811D19C +sPhase2_Transition10_Funcs:: @ 83FD8D4 + .4byte Phase2_Transition10_Func1 + .4byte Phase2_Transition10_Func2 + .4byte Phase2_Transition10_Func3 .align 2 -gUnknown_083FD8E0:: @ 83FD8E0 - .4byte sub_811D200 - .4byte sub_811D260 - .4byte sub_811D2D8 - .4byte sub_811D3B0 - .4byte sub_811D41C +sPhase2_Transition11_Funcs:: @ 83FD8E0 + .4byte Phase2_Transition11_Func1 + .4byte Phase2_Transition11_Func2 + .4byte Phase2_Transition11_Func3 + .4byte Phase2_Transition11_Func4 + .4byte Phase2_Transition11_Func5 .align 1 gUnknown_083FD8F4:: @ 83FD8F4 -- cgit v1.2.3 From f3191f7aa13529f73d28bc48cf74406a204962c9 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 21 Aug 2017 23:05:56 +0200 Subject: name suggestions, phase2 data to C --- data/battle_transition.s | 163 ----------------------------------------------- 1 file changed, 163 deletions(-) (limited to 'data') diff --git a/data/battle_transition.s b/data/battle_transition.s index e15d03dd6..55f7defa6 100644 --- a/data/battle_transition.s +++ b/data/battle_transition.s @@ -4,169 +4,6 @@ .section .rodata -sPhase2_Transition0_Funcs:: @ 83FD7A4 - .4byte Phase2_Transition0_Func1 - .4byte Phase2_Transition0_Func2 - .4byte Phase2_Transition0_Func3 - - .align 2 -sPhase2_Transition1_Funcs:: @ 83FD7B0 - .4byte Phase2_Transition1_Func1 - .4byte Phase2_Transition1_Func2 - - .align 2 -sPhase2_Transition2_Funcs:: @ 83FD7B8 - .4byte Phase2_Transition2_Func1 - .4byte Phase2_Transition2_Func2 - - .align 2 -sPhase2_Transition3_Funcs:: @ 83FD7C0 - .4byte Phase2_Transition3_Func1 - .4byte Phase2_Transition3_Func2 - .4byte Phase2_Transition3_Func3 - .4byte Phase2_Transition3_Func4 - .4byte Phase2_Transition3_Func5 - .4byte Phase2_Transition3_Func6 - - .align 2 -sPhase2_Transition4_Funcs:: @ 83FD7D8 - .4byte Phase2_Transition4_Func1 - .4byte Phase2_Transition4_Func2 - .4byte Phase2_Transition4_Func3 - - .align 1 -gUnknown_083FD7E4:: @ 83FD7E4 - .2byte -16 - .2byte 256 - - .align 1 -gUnknown_083FD7E8:: @ 83FD7E8 - .2byte 0 - .2byte 32 - .2byte 64 - .2byte 18 - .2byte 48 - - .align 1 -gUnknown_083FD7F2:: @ 83FD7F2 - .2byte 8 - .2byte -8 - - .align 2 -sPhase2_Transition5_Funcs:: @ 83FD7F8 - .4byte Phase2_Transition5_Func1 - .4byte Phase2_Transition5_Func2 - .4byte Phase2_Transition5_Func3 - .4byte Phase2_Transition5_Func4 - .4byte Phase2_Transition5_Func5 - .4byte Phase2_Transition5_Func6 - .4byte Phase2_Transition5_Func7 - - .align 2 -sPhase2_Transition6_Funcs:: @ 83FD814 - .4byte Phase2_Transition6_Func1 - .4byte Phase2_Transition6_Func2 - - .align 2 -sPhase2_Transition7_Funcs:: @ 83FD81C - .4byte Phase2_Transition7_Func1 - .4byte Phase2_Transition7_Func2 - .4byte Phase2_Transition7_Func3 - - .align 2 -sPhase2_Mugshot_Transition_Funcs:: @ 83FD828 - .4byte Phase2_Mugshot_Func1 - .4byte Phase2_Mugshot_Func2 - .4byte Phase2_Mugshot_Func3 - .4byte Phase2_Mugshot_Func4 - .4byte Phase2_Mugshot_Func5 - .4byte Phase2_Mugshot_Func6 - .4byte Phase2_Mugshot_Func7 - .4byte Phase2_Mugshot_Func8 - .4byte Phase2_Mugshot_Func9 - .4byte Phase2_Mugshot_Func10 - -sMugshotsTrainerPicIDsTable:: @ 83FD850 - .byte TRAINER_PIC_SIDNEY - .byte TRAINER_PIC_PHOEBE - .byte TRAINER_PIC_GLACIA - .byte TRAINER_PIC_DRAKE - .byte TRAINER_PIC_STEVEN - - .align 1 -sMugshotsOpponentRotationScales:: @ 83FD856 - .2byte 0x200, 0x200 - .2byte 0x200, 0x200 - .2byte 0x1B0, 0x1B0 - .2byte 0x1A0, 0x1A0 - .2byte 0x188, 0x188 - - .align 1 -sMugshotsOpponentCoords:: @ 83FD86A - .2byte 0, 0 - .2byte 0, 0 - .2byte -4, 4 - .2byte 0, 5 - .2byte 0, 7 - - .align 2 -gUnknown_083FD880:: @ 83FD880 - .4byte sub_811C934 - .4byte sub_811C938 - .4byte sub_811C984 - .4byte sub_811C9B8 - .4byte sub_811C934 - .4byte sub_811C9E4 - .4byte sub_811C934 - - .align 1 -gUnknown_083FD89C:: @ 83FD89C - .2byte 12, -12 - - .align 1 -gUnknown_083FD8A0:: @ 83FD8A0 - .2byte -1, 1 - - .align 2 -sPhase2_Transition8_Funcs:: @ 83FD8A4 - .4byte Phase2_Transition8_Func1 - .4byte Phase2_Transition8_Func2 - .4byte Phase2_Transition8_Func3 - - .align 2 -sPhase2_Transition9_Funcs:: @ 83FD8B0 - .4byte Phase2_Transition9_Func1 - .4byte Phase2_Transition9_Func2 - .4byte Phase2_Transition9_Func3 - .4byte Phase2_Transition9_Func4 - .4byte Phase2_Transition9_Func5 - - .align 1 -gUnknown_083FD8C4:: @ 83FD8C4 - .2byte 0 - .2byte 20 - .2byte 15 - .2byte 40 - .2byte 10 - .2byte 25 - .2byte 35 - .2byte 5 - - .align 2 -sPhase2_Transition10_Funcs:: @ 83FD8D4 - .4byte Phase2_Transition10_Func1 - .4byte Phase2_Transition10_Func2 - .4byte Phase2_Transition10_Func3 - - .align 2 -sPhase2_Transition11_Funcs:: @ 83FD8E0 - .4byte Phase2_Transition11_Func1 - .4byte Phase2_Transition11_Func2 - .4byte Phase2_Transition11_Func3 - .4byte Phase2_Transition11_Func4 - .4byte Phase2_Transition11_Func5 - - .align 1 gUnknown_083FD8F4:: @ 83FD8F4 .2byte 56, 0, 0, 160, 0 .2byte 104, 160, 240, 88, 1 -- cgit v1.2.3 From fc9f7853a0e8dde9f80c1e16bee3a05978d29d15 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 21 Aug 2017 23:40:13 +0200 Subject: up to sub_811D584 --- data/battle_transition.s | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'data') diff --git a/data/battle_transition.s b/data/battle_transition.s index 55f7defa6..3dd12ef76 100644 --- a/data/battle_transition.s +++ b/data/battle_transition.s @@ -4,31 +4,6 @@ .section .rodata -gUnknown_083FD8F4:: @ 83FD8F4 - .2byte 56, 0, 0, 160, 0 - .2byte 104, 160, 240, 88, 1 - .2byte 240, 72, 56, 0, 1 - .2byte 0, 32, 144, 160, 0 - .2byte 144, 160, 184, 0, 1 - .2byte 56, 0, 168, 160, 0 - .2byte 168, 160, 48, 0, 1 - - .align 1 -gUnknown_083FD93A:: @ 83FD93A - .2byte 8 - .2byte 4 - .2byte 2 - .2byte 1 - .2byte 1 - .2byte 1 - .2byte 0 - - .align 2 -gUnknown_083FD948:: @ 83FD948 - .4byte sub_811D584 - .4byte sub_811D5E0 - - .align 2 gSpriteImageTable_83FD950:: @ 83FD950 obj_frame_tiles gSpriteImage_83FC148, 0x200 -- cgit v1.2.3 From e262fb05fb9a4a1fe1f1c3966e2c7e465b446ea9 Mon Sep 17 00:00:00 2001 From: Touched Date: Tue, 22 Aug 2017 18:15:36 +0200 Subject: Convert data/field_ground_effect.s to C --- data/field_ground_effect.s | 72 ---------------------------------------------- 1 file changed, 72 deletions(-) delete mode 100644 data/field_ground_effect.s (limited to 'data') diff --git a/data/field_ground_effect.s b/data/field_ground_effect.s deleted file mode 100644 index d3dbceedb..000000000 --- a/data/field_ground_effect.s +++ /dev/null @@ -1,72 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_08376040:: @ 8376040 - .4byte MetatileBehavior_IsJumpSouth - .4byte MetatileBehavior_IsJumpNorth - .4byte MetatileBehavior_IsJumpWest - .4byte MetatileBehavior_IsJumpEast - -gUnknown_08376050:: @ 8376050 - .byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73 - -@ Each byte corresponds to a sprite priority for a field object. -@ This is directly the inverse of gFieldObjectPriorities_08376070. -gFieldObjectPriorities_08376060:: @ 8376060 - .byte 2, 2, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 0, 0, 2 - -@ Each byte corresponds to a sprite priority for a field object. -@ This is the inverse of gFieldObjectPriorities_08376060. -@ 1 = Above player sprite -@ 2 = Below player sprite -gFieldObjectPriorities_08376070:: @ 8376070 - .byte 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 0, 0, 1 - - .align 2 -gUnknown_08376080:: @ 8376080 - .4byte nullsub_50 - .4byte DoTracksGroundEffect_Footprints - .4byte DoTracksGroundEffect_BikeTireTracks - -@ First byte is a Field Effect script id. (gFieldEffectScriptPointers) -@ Last three bytes are unknown. -gSandFootprints_FieldEffectData:: @ 837608C - .byte 0xD, 0x0, 0x18, 0x0 - -@ Specifies which bike track shape to show next. -@ For example, when the bike turns from up to right, it will show -@ a track that curves to the right. -@ Each 4-byte row corresponds to the initial direction of the bike, and -@ each byte in that row is for the next direction of the bike in the order -@ of down, up, left, right. -gBikeTireTracks_Transitions:: @ 8376090 - .byte 1, 2, 7, 8 - .byte 1, 2, 6, 5 - .byte 5, 8, 3, 4 - .byte 6, 7, 3, 4 - - .align 2 -gUnknown_083760A0:: @ 83760A0 - .4byte GroundEffect_SpawnOnTallGrass - .4byte sub_8063E94 - .4byte sub_8063EE0 - .4byte sub_8063F2C - .4byte GroundEffect_WaterReflection - .4byte GroundEffect_IceReflection - .4byte GroundEffect_FlowingWater - .4byte sub_8063FA0 - .4byte sub_8063FCC - .4byte GroundEffect_Ripple - .4byte GroundEffect_StepOnPuddle - .4byte GroundEffect_SandPile - .4byte GroundEffect_JumpOnTallGrass - .4byte GroundEffect_JumpOnLongGrass - .4byte GroundEffect_JumpOnShallowWater - .4byte GroundEffect_JumpOnWater - .4byte GroundEffect_JumpLandingDust - .4byte GroundEffect_ShortGrass - .4byte GroundEffect_HotSprings - .4byte GroundEffect_Seaweed -- cgit v1.2.3 From aa3988cc1ace31f97590b4ac3b33c4fa3a5e13dc Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 22 Aug 2017 20:51:53 +0200 Subject: move all data to C --- data/battle_transition.s | 132 ----------------------------------------------- 1 file changed, 132 deletions(-) delete mode 100644 data/battle_transition.s (limited to 'data') diff --git a/data/battle_transition.s b/data/battle_transition.s deleted file mode 100644 index 3dd12ef76..000000000 --- a/data/battle_transition.s +++ /dev/null @@ -1,132 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - -gSpriteImageTable_83FD950:: @ 83FD950 - obj_frame_tiles gSpriteImage_83FC148, 0x200 - - .align 2 -gSpriteAnim_83FD958:: @ 83FD958 - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83FD960:: @ 83FD960 - .4byte gSpriteAnim_83FD958 - - .align 2 -gSpriteAffineAnim_83FD964:: @ 83FD964 - obj_rot_scal_anim_frame 0x0, 0x0, -4, 1 - obj_rot_scal_anim_jump 0 - - .align 2 -gSpriteAffineAnim_83FD974:: @ 83FD974 - obj_rot_scal_anim_frame 0x0, 0x0, 4, 1 - obj_rot_scal_anim_jump 0 - - .align 2 -gSpriteAffineAnimTable_83FD984:: @ 83FD984 - .4byte gSpriteAffineAnim_83FD964 - .4byte gSpriteAffineAnim_83FD974 - - .align 2 -gSpriteTemplate_83FD98C:: @ 83FD98C - spr_template 0xFFFF, 4105, gFieldOamData_32x32, gSpriteAnimTable_83FD960, gSpriteImageTable_83FD950, gSpriteAffineAnimTable_83FD984, sub_811B720 - - .align 2 -gOamData_83FD9A4:: @ 83FD9A4 - .2byte 0x0000 - .2byte 0xC000 - .2byte 0x0000 - - .align 2 -gSpriteImageTable_83FD9AC:: @ 83FD9AC - obj_frame_tiles gSpriteImage_83FC528, 0x800 - - .align 2 -gSpriteImageTable_83FD9B4:: @ 83FD9B4 - obj_frame_tiles gSpriteImage_83FCD28, 0x800 - - .align 2 -gSpriteAnim_83FD9BC:: @ 83FD9BC - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_83FD9C4:: @ 83FD9C4 - .4byte gSpriteAnim_83FD9BC - - .align 2 -gSpriteTemplate_83FD9C8:: @ 83FD9C8 - spr_template 0xFFFF, 4106, gOamData_83FD9A4, gSpriteAnimTable_83FD9C4, gSpriteImageTable_83FD9AC, gDummySpriteAffineAnimTable, sub_811C90C - - .align 2 -gSpriteTemplate_83FD9E0:: @ 83FD9E0 - spr_template 0xFFFF, 4106, gOamData_83FD9A4, gSpriteAnimTable_83FD9C4, gSpriteImageTable_83FD9B4, gDummySpriteAffineAnimTable, sub_811C90C - - .align 2 -gFieldEffectObjectPalette10:: @ 83FD9F8 - .incbin "graphics/field_effect_objects/palettes/10.gbapal" - - .align 2 -gFieldEffectObjectPaletteInfo10:: @ 83FDA18 - obj_pal gFieldEffectObjectPalette10, 0x1009 - - .align 2 -sMugshotPal_Sydney: - .incbin "graphics/battle_transitions/sidney_bg.gbapal" - - .align 2 -sMugshotPal_Phoebe: - .incbin "graphics/battle_transitions/phoebe_bg.gbapal" - - .align 2 -sMugshotPal_Glacia: - .incbin "graphics/battle_transitions/glacia_bg.gbapal" - - .align 2 -sMugshotPal_Drake: - .incbin "graphics/battle_transitions/drake_bg.gbapal" - - .align 2 -sMugshotPal_Steven: - .incbin "graphics/battle_transitions/steven_bg.gbapal" - - .align 2 -sMugshotPal_Brendan: - .incbin "graphics/battle_transitions/brendan_bg.gbapal" - - .align 2 -sMugshotPal_May: - .incbin "graphics/battle_transitions/may_bg.gbapal" - - .align 2 -sOpponentMugshotsPals:: @ 83FDB00 - .4byte sMugshotPal_Sydney - .4byte sMugshotPal_Phoebe - .4byte sMugshotPal_Glacia - .4byte sMugshotPal_Drake - .4byte sMugshotPal_Steven - - .align 2 -sPlayerMugshotsPals:: @ 83FDB14 - .4byte sMugshotPal_Brendan - .4byte sMugshotPal_May - - .align 2 -UnusedTrainerPalette: - .incbin "graphics/battle_transitions/unused_trainer.gbapal" - - .align 2 -gSpritePalette_UnusedTrainer:: @ 83FDB3C - obj_pal UnusedTrainerPalette, 0x100A - - .align 2 -gUnknown_083FDB44:: @ 83FDB44 - .incbin "graphics/battle_transitions/big_pokeball_map.bin" - - .align 2 -gUnknown_083FDFF4:: @ 83FDFF4 - .incbin "graphics/battle_transitions/elite_four_bg_map.bin" -- cgit v1.2.3 From bfc4b338cbd3e78062c71ff6f72f821631277c1b Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 22 Aug 2017 17:34:42 -0500 Subject: rename some mauville man stuff --- data/mauville_old_man.s | 23 ++--------------------- data/scripts/giddy.inc | 2 +- data/specials.inc | 2 +- 3 files changed, 4 insertions(+), 23 deletions(-) (limited to 'data') diff --git a/data/mauville_old_man.s b/data/mauville_old_man.s index 5c4bd47b9..f96963d2d 100644 --- a/data/mauville_old_man.s +++ b/data/mauville_old_man.s @@ -3,27 +3,8 @@ .section .rodata - .align 1 -gUnknown_083E537C:: @ 83E537C -.ifdef ENGLISH - ec_word SISTER - ec_word EATS - ec_word SWEETS - ec_word VORACIOUS - ec_word AND - ec_word DROOLING -.else - ec_word SISTER - ec_word MUST_BE - ec_word SWEETS - ec_word VORACIOUS - ec_word DROOLING - ec_word THICK -.endif - - .align 2 -gUnknown_083E5388:: @ 83E5388 +gGiddyAdjectives:: @ 83E5388 .4byte OtherText_SoPretty .4byte OtherText_SoDarling .4byte OtherText_SoRelaxed @@ -34,7 +15,7 @@ gUnknown_083E5388:: @ 83E5388 .4byte OtherText_SoMagical .align 2 -gUnknown_083E53A8:: @ 83E53A8 +gGiddyQuestions:: @ 83E53A8 .4byte OtherText_WantVacationNicePlace .4byte OtherText_BoughtCrayonsIsNice .4byte OtherText_IfWeCouldFloat diff --git a/data/scripts/giddy.inc b/data/scripts/giddy.inc index 263589fe9..bc7b1b8f1 100644 --- a/data/scripts/giddy.inc +++ b/data/scripts/giddy.inc @@ -30,7 +30,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B0A40:: @ 81B0A40 end MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E:: @ 81B0A4E - special sub_80F7CF4 + special ScrSpecial_GenerateGiddyLine special ShowFieldMessageStringVar4 waittext yesnobox 20, 8 diff --git a/data/specials.inc b/data/specials.inc index 0eb6b742d..e588a29d3 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -112,7 +112,7 @@ gSpecials:: def_special sub_80F7C90 def_special sub_80F7C54 def_special sub_80F83D0 - def_special sub_80F7CF4 + def_special ScrSpecial_GenerateGiddyLine def_special sub_80F7CC8 def_special sub_80F889C def_special sub_80F8888 -- cgit v1.2.3 From 988f5a685a36d3591d07f71ca778d988fb26720a Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 24 Aug 2017 01:10:30 -0500 Subject: decompile up to sub_80F8598 --- data/mauville_old_man.s | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'data') diff --git a/data/mauville_old_man.s b/data/mauville_old_man.s index f96963d2d..4ccec0db3 100644 --- a/data/mauville_old_man.s +++ b/data/mauville_old_man.s @@ -3,37 +3,6 @@ .section .rodata - .align 2 -gGiddyAdjectives:: @ 83E5388 - .4byte OtherText_SoPretty - .4byte OtherText_SoDarling - .4byte OtherText_SoRelaxed - .4byte OtherText_SoSunny - .4byte OtherText_SoDesirable - .4byte OtherText_SoExciting - .4byte OtherText_SoAmusing - .4byte OtherText_SoMagical - - .align 2 -gGiddyQuestions:: @ 83E53A8 - .4byte OtherText_WantVacationNicePlace - .4byte OtherText_BoughtCrayonsIsNice - .4byte OtherText_IfWeCouldFloat - .4byte OtherText_SandWashesAwayMakeSad - .4byte OtherText_WhatsBottomSeaLike - .4byte OtherText_SeeSettingSun - .4byte OtherText_LyingInGreenGrass - .4byte OtherText_SecretBasesWonderful - - .align 1 -gUnknown_083E53C8:: @ 83E53C8 - .2byte 0x0, 0 - .2byte 0xC, 0 - .2byte 0xD, 0 - .2byte 0x12, 0 - .2byte 0x13, 0 - .2byte 0x15, 0 - .align 2 gUnknown_083E53E0:: @ 83E53E0 .4byte 0x132, UnknownString_81AEFFC, UnknownString_81AF013, UnknownString_81AF022 @@ -71,8 +40,6 @@ gUnknown_083E53E0:: @ 83E53E0 .4byte 0x12e, UnknownString_81B0523, UnknownString_81B053E, UnknownString_81B0554 .4byte 0x12f, UnknownString_81B05D8, UnknownString_81B05F3, UnknownString_81B0610 .4byte 0x130, UnknownString_81B06A9, UnknownString_81B06C6, UnknownString_81B06D9 - -gUnknown_083E5610:: @ 83E5610 .4byte 0x131, UnknownString_81B0763, UnknownString_81B0781, UnknownString_81B0797 .align 2 -- cgit v1.2.3 From 1ae38be0a46d1d901a2d9e5bb22938a0cecf6b7f Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 24 Aug 2017 15:19:55 -0500 Subject: do some renaming and reorganizing --- data/event_scripts.s | 11 +- data/mauville_old_man.s | 49 ------ data/scripts/bard.inc | 67 -------- data/scripts/giddy.inc | 51 ------ data/scripts/hipster.inc | 25 --- data/scripts/mauville_man.inc | 350 ++++++++++++++++++++++++++++++++++++++++++ data/scripts/storyteller.inc | 82 ---------- data/scripts/trader.inc | 88 ----------- data/specials.inc | 10 +- data/text/bard.inc | 18 +-- 10 files changed, 365 insertions(+), 386 deletions(-) delete mode 100644 data/mauville_old_man.s delete mode 100644 data/scripts/bard.inc delete mode 100644 data/scripts/giddy.inc delete mode 100644 data/scripts/hipster.inc create mode 100644 data/scripts/mauville_man.inc delete mode 100644 data/scripts/storyteller.inc delete mode 100644 data/scripts/trader.inc (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index d6702745a..33bb39308 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -4744,16 +4744,7 @@ BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F .include "data/scripts/gabby_and_ty.inc" - .include "data/scripts/bard.inc" - .include "data/scripts/hipster.inc" - .include "data/text/trader.inc" - .include "data/scripts/trader.inc" - .include "data/text/storyteller.inc" - .include "data/scripts/storyteller.inc" - .include "data/text/giddy.inc" - .include "data/scripts/giddy.inc" - .include "data/text/bard.inc" - .include "data/text/hipster.inc" + .include "data/scripts/mauville_man.inc" .include "data/field_move_scripts.inc" .include "data/item_ball_scripts.inc" diff --git a/data/mauville_old_man.s b/data/mauville_old_man.s deleted file mode 100644 index 4ccec0db3..000000000 --- a/data/mauville_old_man.s +++ /dev/null @@ -1,49 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_083E53E0:: @ 83E53E0 - .4byte 0x132, UnknownString_81AEFFC, UnknownString_81AF013, UnknownString_81AF022 - .4byte 0x102, UnknownString_81AF0A3, UnknownString_81AF0BB, UnknownString_81AF0CA - .4byte 0x103, UnknownString_81AF149, UnknownString_81AF164, UnknownString_81AF174 - .4byte 0x104, UnknownString_81AF1E5, UnknownString_81AF1FD, UnknownString_81AF20A - .4byte 0x106, UnknownString_81AF281, UnknownString_81AF299, UnknownString_81AF2A9 - .4byte 0x109, UnknownString_81AF32C, UnknownString_81AF345, UnknownString_81AF34D - .4byte 0x10b, UnknownString_81AF3D0, UnknownString_81AF3ED, UnknownString_81AF3FC - .4byte 0x10c, UnknownString_81AF46D, UnknownString_81AF481, UnknownString_81AF49B - .4byte 0x10d, UnknownString_81AF511, UnknownString_81AF529, UnknownString_81AF536 - .4byte 0x10e, UnknownString_81AF5A9, UnknownString_81AF5BD, UnknownString_81AF5CD - .4byte 0x10f, UnknownString_81AF63F, UnknownString_81AF661, UnknownString_81AF676 - .4byte 0x110, UnknownString_81AF711, UnknownString_81AF726, UnknownString_81AF73D - .4byte 0x111, UnknownString_81AF7BF, UnknownString_81AF7D9, UnknownString_81AF7F1 - .4byte 0x112, UnknownString_81AF88A, UnknownString_81AF8A1, UnknownString_81AF8AA - .4byte 0x113, UnknownString_81AF91B, UnknownString_81AF935, UnknownString_81AF943 - .4byte 0x114, UnknownString_81AF9C8, UnknownString_81AF9E0, UnknownString_81AF9F6 - .4byte 0x11a, UnknownString_81AFA79, UnknownString_81AFA92, UnknownString_81AFA9E - .4byte 0x11b, UnknownString_81AFB17, UnknownString_81AFB2D, UnknownString_81AFB48 - .4byte 0x11c, UnknownString_81AFBD8, UnknownString_81AFBE7, UnknownString_81AFC04 - .4byte 0x21d, UnknownString_81AFC8A, UnknownString_81AFC9D, UnknownString_81AFCBE - .4byte 0x11e, UnknownString_81AFD44, UnknownString_81AFD60, UnknownString_81AFD80 - .4byte 0x121, UnknownString_81AFE1D, UnknownString_81AFE36, UnknownString_81AFE42 - .4byte 0x124, UnknownString_81AFEC2, UnknownString_81AFEDD, UnknownString_81AFEEE - .4byte 0x125, UnknownString_81AFF68, UnknownString_81AFF7B, UnknownString_81AFF88 - .4byte 0x126, UnknownString_81AFFFB, UnknownString_81B000D, UnknownString_81B0015 - .4byte 0x127, UnknownString_81B009D, UnknownString_81B00B6, UnknownString_81B00C9 - .4byte 0x128, UnknownString_81B014D, UnknownString_81B0165, UnknownString_81B0173 - .4byte 0x129, UnknownString_81B01E9, UnknownString_81B0201, UnknownString_81B0213 - .4byte 0x12a, UnknownString_81B0290, UnknownString_81B02A5, UnknownString_81B02B6 - .4byte 0x12b, UnknownString_81B0337, UnknownString_81B0351, UnknownString_81B0364 - .4byte 0x12c, UnknownString_81B03E9, UnknownString_81B0401, UnknownString_81B040C - .4byte 0x12d, UnknownString_81B046E, UnknownString_81B0489, UnknownString_81B049A - .4byte 0x12e, UnknownString_81B0523, UnknownString_81B053E, UnknownString_81B0554 - .4byte 0x12f, UnknownString_81B05D8, UnknownString_81B05F3, UnknownString_81B0610 - .4byte 0x130, UnknownString_81B06A9, UnknownString_81B06C6, UnknownString_81B06D9 - .4byte 0x131, UnknownString_81B0763, UnknownString_81B0781, UnknownString_81B0797 - - .align 2 -gUnknown_083E5620:: @ 83E5620 - .4byte 0x24 - .4byte gSaveBlock1 + 0x2D94 - .4byte 0xC diff --git a/data/scripts/bard.inc b/data/scripts/bard.inc deleted file mode 100644 index 3f25b100f..000000000 --- a/data/scripts/bard.inc +++ /dev/null @@ -1,67 +0,0 @@ -MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744 - special sub_80F7B14 - switch RESULT - case 0, MauvilleCity_PokemonCenter_1F_EventScript_1AE784 - case 1, MauvilleCity_PokemonCenter_1F_EventScript_1AE845 - case 2, MauvilleCity_PokemonCenter_1F_EventScript_1AEBAB - case 3, MauvilleCity_PokemonCenter_1F_EventScript_1B0816 - case 4, MauvilleCity_PokemonCenter_1F_EventScript_1B09EB - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AE784:: @ 81AE784 - lock - faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0A91, 5 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7A5 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7C8 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AE7A5:: @ 81AE7A5 - setvar 0x8004, 0 - special sub_80F7C54 - pause 60 - special sub_80F7B2C - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7D2 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0AED, 4 - release - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AE7C8:: @ 81AE7C8 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0AC3, 4 - release - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AE7D2:: @ 81AE7D2 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0B2C, 5 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7F1 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE83B - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AE7F1:: @ 81AE7F1 - setvar 0x8004, 6 - call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3 - lock - faceplayer - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE83B - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0BD0, 4 - setvar 0x8004, 1 - special sub_80F7C54 - pause 60 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0BFA, 5 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE7F1 - special sub_80F7B40 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0C23, 4 - release - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AE83B:: @ 81AE83B - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0BA6, 4 - release - end diff --git a/data/scripts/giddy.inc b/data/scripts/giddy.inc deleted file mode 100644 index bc7b1b8f1..000000000 --- a/data/scripts/giddy.inc +++ /dev/null @@ -1,51 +0,0 @@ -MauvilleCity_PokemonCenter_1F_EventScript_1B09EB:: @ 81B09EB - lock - faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_1B092A, 5 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A6F - end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C:: @ 81B0A0C - special sub_80F7CC8 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A79 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A26:: @ 81B0A26 - special sub_80F7CC8 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A40 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A79 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A40:: @ 81B0A40 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0998, 4 - jump MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E - end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E:: @ 81B0A4E - special ScrSpecial_GenerateGiddyLine - special ShowFieldMessageStringVar4 - waittext - yesnobox 20, 8 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A26 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A26 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A6F:: @ 81B0A6F - msgbox MauvilleCity_PokemonCenter_1F_Text_1B097C, 4 - release - end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A79:: @ 81B0A79 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B09B0, 4 - release - end diff --git a/data/scripts/hipster.inc b/data/scripts/hipster.inc deleted file mode 100644 index 3e24e4868..000000000 --- a/data/scripts/hipster.inc +++ /dev/null @@ -1,25 +0,0 @@ -MauvilleCity_PokemonCenter_1F_EventScript_1AE845:: @ 81AE845 - lock - faceplayer - setflag 2054 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0C5B, 4 - special sub_80F7C70 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE86A - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0CA7, 4 - release - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AE86A:: @ 81AE86A - special sub_80F7C90 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE882 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D11, 4 - release - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AE882:: @ 81AE882 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D75, 4 - special sub_80F7C84 - release - end diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc new file mode 100644 index 000000000..f406d33fe --- /dev/null +++ b/data/scripts/mauville_man.inc @@ -0,0 +1,350 @@ +@ From mauville_old_man.h +@ TODO: Put these in a header + +MAUVILLE_MAN_BARD = 0 +MAUVILLE_MAN_HIPSTER = 1 +MAUVILLE_MAN_TRADER = 2 +MAUVILLE_MAN_STORYTELLER = 3 +MAUVILLE_MAN_GIDDY = 4 + +MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744 + special ScrSpecial_GetCurrentMauvilleMan + switch RESULT + case MAUVILLE_MAN_BARD, speak_to_bard + case MAUVILLE_MAN_HIPSTER, speak_to_hipster + case MAUVILLE_MAN_TRADER, speak_to_trader + case MAUVILLE_MAN_STORYTELLER, speak_to_storyteller + case MAUVILLE_MAN_GIDDY, MauvilleCity_PokemonCenter_1F_EventScript_1B09EB + end + +@------------------------------------------------------------------------------- +@ Bard +@------------------------------------------------------------------------------- + +speak_to_bard: + lock + faceplayer + msgbox gTextBard_HiImTheBard, MSGBOX_YESNO + compare RESULT, YES + jumpeq yes_hear_song + compare RESULT, NO + jumpeq dont_hear_song + end +yes_hear_song: + setvar 0x8004, 0 + special ScrSpecial_PlayBardSong + pause 60 + special ScrSpecial_HasBardSongBeenChanged + compare RESULT, FALSE + jumpeq prompt_write_lyrics @ Prompt new lyrics only if song hasn't been changed + msgbox gTextBard_OhWhatAMovingSong, 4 + release + end +dont_hear_song: + msgbox gTextBard_OhYouveLeftMe, 4 + release + end +prompt_write_lyrics: + msgbox gTextBard_SoHowDoYouLikeMySong, MSGBOX_YESNO + compare RESULT, YES + jumpeq write_lyrics + compare RESULT, NO + jumpeq dont_write_lyrics + end +write_lyrics: + setvar 0x8004, 6 + call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3 + lock + faceplayer + compare RESULT, NO + jumpeq dont_write_lyrics + msgbox gTextBard_ThankYouKindly, 4 + setvar 0x8004, 1 + special ScrSpecial_PlayBardSong + pause 60 + msgbox gTextBard_WasThatHowYouWanted, MSGBOX_YESNO + compare RESULT, NO + jumpeq write_lyrics @ Keep looping until player responds YES + special ScrSpecial_SaveBardSongLyrics + msgbox gTextBard_OkayThatsIt, 4 + release + end +dont_write_lyrics: + msgbox gTextBard_OhYouveLeftMe2, 4 + release + end + +@------------------------------------------------------------------------------- +@ Hipster +@------------------------------------------------------------------------------- + +speak_to_hipster:: @ 81AE845 + lock + faceplayer + setflag 2054 + msgbox MauvilleCity_PokemonCenter_1F_Text_1B0C5B, 4 + special sub_80F7C70 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE86A + msgbox MauvilleCity_PokemonCenter_1F_Text_1B0CA7, 4 + release + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AE86A:: @ 81AE86A + special sub_80F7C90 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE882 + msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D11, 4 + release + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AE882:: @ 81AE882 + msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D75, 4 + special ScrSpecial_SetHipsterSpokenFlag + release + end + +@------------------------------------------------------------------------------- +@ Trader +@------------------------------------------------------------------------------- + + .include "data/text/trader.inc" + +speak_to_trader:: @ 81AEBAB + lock + faceplayer + msgbox MauvilleCity_PokemonCenter_1F_Text_1AE88F, 5 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA + special sub_8109C44 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3 + message MauvilleCity_PokemonCenter_1F_Text_1AE910 + waittext + jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA:: @ 81AEBDA + msgbox MauvilleCity_PokemonCenter_1F_Text_1AE8C6, 2 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3:: @ 81AEBE3 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AE8DF, 2 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC:: @ 81AEBEC + special sub_8109E34 + waitstate + compare 0x8004, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D + compare 0x8004, 65535 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC36 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AE97C, 5 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC42 + special sub_8109C58 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E + jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D:: @ 81AEC2D + msgbox MauvilleCity_PokemonCenter_1F_Text_1AE950, 2 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEC36:: @ 81AEC36 + message MauvilleCity_PokemonCenter_1F_Text_1AEB31 + waittext + jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEC42:: @ 81AEC42 + message MauvilleCity_PokemonCenter_1F_Text_1AE910 + waittext + jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E:: @ 81AEC4E + msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9B6, 2 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AEC57:: @ 81AEC57 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9F8, 4 + special sub_8109CF0 + waitstate + compare 0x8006, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECA6 + compare 0x8006, 65535 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECAF + special sub_8109C90 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECBD + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA9B, 5 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 + special sub_8109DE0 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAFB, 2 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AECA6:: @ 81AECA6 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA2B, 2 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AECAF:: @ 81AECAF + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAC3, 4 + jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1AECBD:: @ 81AECBD + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA57, 2 + end + +@------------------------------------------------------------------------------- +@ Storyteller +@------------------------------------------------------------------------------- + + .include "data/text/storyteller.inc" + +speak_to_storyteller:: @ 81B0816 + setvar 0x8008, 0 + setvar 0x8009, 0 + setvar 0x800a, 0 + setvar 0x800b, 0 + lock + faceplayer + msgbox MauvilleCity_PokemonCenter_1F_Text_1AECC6, 5 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 + specialval RESULT, sub_80F889C + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B08D3 + +MauvilleCity_PokemonCenter_1F_EventScript_1B084F:: @ 81B084F + message MauvilleCity_PokemonCenter_1F_Text_1AED35 + waittext + special sub_80F8874 + waitstate + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0883 + setvar 0x8008, 1 + special sub_80F8888 + waittext + waitbutton + specialval RESULT, sub_80F88AC + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0893 + jump MauvilleCity_PokemonCenter_1F_EventScript_1B0909 + +MauvilleCity_PokemonCenter_1F_EventScript_1B0883:: @ 81B0883 + compare 0x8008, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 + jump MauvilleCity_PokemonCenter_1F_EventScript_1B08AE + +MauvilleCity_PokemonCenter_1F_EventScript_1B0893:: @ 81B0893 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEE50, 4 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF0A, 5 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B084F + +MauvilleCity_PokemonCenter_1F_EventScript_1B08AE:: @ 81B08AE + specialval RESULT, sub_80F88E0 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F + specialval RESULT, sub_80F889C + compare RESULT, 4 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F + jump MauvilleCity_PokemonCenter_1F_EventScript_1B08DB + +MauvilleCity_PokemonCenter_1F_EventScript_1B08D3:: @ 81B08D3 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AED70, 4 + +MauvilleCity_PokemonCenter_1F_EventScript_1B08DB:: @ 81B08DB + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEEB4, 5 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 + specialval RESULT, sub_80F88FC + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0909 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF49, 4 + closebutton + release + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0909:: @ 81B0909 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEDE8, 4 + closebutton + release + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0914:: @ 81B0914 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AED1D, 4 + closebutton + release + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B091F:: @ 81B091F + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEFA5, 4 + closebutton + release + end + +@------------------------------------------------------------------------------- +@ Giddy +@------------------------------------------------------------------------------- + + .include "data/text/giddy.inc" + +MauvilleCity_PokemonCenter_1F_EventScript_1B09EB:: @ 81B09EB + lock + faceplayer + msgbox MauvilleCity_PokemonCenter_1F_Text_1B092A, 5 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A6F + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C:: @ 81B0A0C + special sub_80F7CC8 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A79 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0A26:: @ 81B0A26 + special sub_80F7CC8 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A40 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A79 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0A40:: @ 81B0A40 + msgbox MauvilleCity_PokemonCenter_1F_Text_1B0998, 4 + jump MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E:: @ 81B0A4E + special ScrSpecial_GenerateGiddyLine + special ShowFieldMessageStringVar4 + waittext + yesnobox 20, 8 + compare RESULT, 1 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A26 + compare RESULT, 0 + jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A26 + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0A6F:: @ 81B0A6F + msgbox MauvilleCity_PokemonCenter_1F_Text_1B097C, 4 + release + end + +MauvilleCity_PokemonCenter_1F_EventScript_1B0A79:: @ 81B0A79 + msgbox MauvilleCity_PokemonCenter_1F_Text_1B09B0, 4 + release + end + + .include "data/text/bard.inc" + .include "data/text/hipster.inc" \ No newline at end of file diff --git a/data/scripts/storyteller.inc b/data/scripts/storyteller.inc deleted file mode 100644 index eba94e698..000000000 --- a/data/scripts/storyteller.inc +++ /dev/null @@ -1,82 +0,0 @@ -MauvilleCity_PokemonCenter_1F_EventScript_1B0816:: @ 81B0816 - setvar 0x8008, 0 - setvar 0x8009, 0 - setvar 0x800a, 0 - setvar 0x800b, 0 - lock - faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_1AECC6, 5 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 - specialval RESULT, sub_80F889C - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B08D3 - -MauvilleCity_PokemonCenter_1F_EventScript_1B084F:: @ 81B084F - message MauvilleCity_PokemonCenter_1F_Text_1AED35 - waittext - special sub_80F8874 - waitstate - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0883 - setvar 0x8008, 1 - special sub_80F8888 - waittext - waitbutton - specialval RESULT, sub_80F88AC - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0893 - jump MauvilleCity_PokemonCenter_1F_EventScript_1B0909 - -MauvilleCity_PokemonCenter_1F_EventScript_1B0883:: @ 81B0883 - compare 0x8008, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 - jump MauvilleCity_PokemonCenter_1F_EventScript_1B08AE - -MauvilleCity_PokemonCenter_1F_EventScript_1B0893:: @ 81B0893 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEE50, 4 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF0A, 5 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B084F - -MauvilleCity_PokemonCenter_1F_EventScript_1B08AE:: @ 81B08AE - specialval RESULT, sub_80F88E0 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F - specialval RESULT, sub_80F889C - compare RESULT, 4 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F - jump MauvilleCity_PokemonCenter_1F_EventScript_1B08DB - -MauvilleCity_PokemonCenter_1F_EventScript_1B08D3:: @ 81B08D3 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AED70, 4 - -MauvilleCity_PokemonCenter_1F_EventScript_1B08DB:: @ 81B08DB - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEEB4, 5 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 - specialval RESULT, sub_80F88FC - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0909 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF49, 4 - closebutton - release - end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0909:: @ 81B0909 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEDE8, 4 - closebutton - release - end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0914:: @ 81B0914 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AED1D, 4 - closebutton - release - end - -MauvilleCity_PokemonCenter_1F_EventScript_1B091F:: @ 81B091F - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEFA5, 4 - closebutton - release - end diff --git a/data/scripts/trader.inc b/data/scripts/trader.inc deleted file mode 100644 index b52c8a2dc..000000000 --- a/data/scripts/trader.inc +++ /dev/null @@ -1,88 +0,0 @@ -MauvilleCity_PokemonCenter_1F_EventScript_1AEBAB:: @ 81AEBAB - lock - faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE88F, 5 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA - special sub_8109C44 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3 - message MauvilleCity_PokemonCenter_1F_Text_1AE910 - waittext - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA:: @ 81AEBDA - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE8C6, 2 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3:: @ 81AEBE3 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE8DF, 2 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC:: @ 81AEBEC - special sub_8109E34 - waitstate - compare 0x8004, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D - compare 0x8004, 65535 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC36 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE97C, 5 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC42 - special sub_8109C58 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D:: @ 81AEC2D - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE950, 2 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC36:: @ 81AEC36 - message MauvilleCity_PokemonCenter_1F_Text_1AEB31 - waittext - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC42:: @ 81AEC42 - message MauvilleCity_PokemonCenter_1F_Text_1AE910 - waittext - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E:: @ 81AEC4E - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9B6, 2 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC57:: @ 81AEC57 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9F8, 4 - special sub_8109CF0 - waitstate - compare 0x8006, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECA6 - compare 0x8006, 65535 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECAF - special sub_8109C90 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECBD - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA9B, 5 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 - special sub_8109DE0 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAFB, 2 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AECA6:: @ 81AECA6 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA2B, 2 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AECAF:: @ 81AECAF - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAC3, 4 - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 - end - -MauvilleCity_PokemonCenter_1F_EventScript_1AECBD:: @ 81AECBD - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA57, 2 - end diff --git a/data/specials.inc b/data/specials.inc index e588a29d3..06ba22a23 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -104,13 +104,13 @@ gSpecials:: def_special DoWateringBerryTreeAnim def_special sub_80E60D8 def_special sub_80EB7C4 - def_special sub_80F7B14 - def_special sub_80F7B2C - def_special sub_80F7B40 + def_special ScrSpecial_GetCurrentMauvilleMan + def_special ScrSpecial_HasBardSongBeenChanged + def_special ScrSpecial_SaveBardSongLyrics def_special sub_80F7C70 - def_special sub_80F7C84 + def_special ScrSpecial_SetHipsterSpokenFlag def_special sub_80F7C90 - def_special sub_80F7C54 + def_special ScrSpecial_PlayBardSong def_special sub_80F83D0 def_special ScrSpecial_GenerateGiddyLine def_special sub_80F7CC8 diff --git a/data/text/bard.inc b/data/text/bard.inc index edf4942f6..bd22c97a3 100644 --- a/data/text/bard.inc +++ b/data/text/bard.inc @@ -1,19 +1,19 @@ -UnknownString_81B0A83: @ 81B0A83 +gTextBard_BardTesting: @ 81B0A83 .string "BARD testing!$" -MauvilleCity_PokemonCenter_1F_Text_1B0A91:: @ 81B0A91 +gTextBard_HiImTheBard:: @ 81B0A91 .string "Hi, I’m the BARD.\n" .string "Would you like to hear my song?$" -MauvilleCity_PokemonCenter_1F_Text_1B0AC3:: @ 81B0AC3 +gTextBard_OhYouveLeftMe:: @ 81B0AC3 .string "Oh...\n" .string "You’ve left me feeling the blues...$" -MauvilleCity_PokemonCenter_1F_Text_1B0AED:: @ 81B0AED +gTextBard_OhWhatAMovingSong:: @ 81B0AED .string "Oh, what a moving song...\n" .string "I wish I could play it for others...$" -MauvilleCity_PokemonCenter_1F_Text_1B0B2C:: @ 81B0B2C +gTextBard_SoHowDoYouLikeMySong:: @ 81B0B2C .string "So?\n" .string "How do you like my song?\p" .string "But I’m none too happy about the\n" @@ -21,18 +21,18 @@ MauvilleCity_PokemonCenter_1F_Text_1B0B2C:: @ 81B0B2C .string "How would you like to write some new\n" .string "lyrics for me?$" -MauvilleCity_PokemonCenter_1F_Text_1B0BA6:: @ 81B0BA6 +gTextBard_OhYouveLeftMe2:: @ 81B0BA6 .string "Oh...\n" .string "You’ve left me feeling the blues...$" -MauvilleCity_PokemonCenter_1F_Text_1B0BD0:: @ 81B0BD0 +gTextBard_ThankYouKindly:: @ 81B0BD0 .string "Thank you kindly!\n" .string "Let me sing it for you.$" -MauvilleCity_PokemonCenter_1F_Text_1B0BFA:: @ 81B0BFA +gTextBard_WasThatHowYouWanted:: @ 81B0BFA .string "Was that how you wanted your song\n" .string "to go?$" -MauvilleCity_PokemonCenter_1F_Text_1B0C23:: @ 81B0C23 +gTextBard_OkayThatsIt:: @ 81B0C23 .string "Okay! That’s it, then.\n" .string "I’ll sing this song for a while.$" -- cgit v1.2.3 From 1b715eb7ba38ff408acf5e5e0a9ea88642f912bb Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 24 Aug 2017 16:52:49 -0500 Subject: more Mauville man labeling --- data/scripts/mauville_man.inc | 160 +++++++++++++++---------------- data/specials.inc | 16 ++-- data/text/hipster.inc | 8 +- data/text/storyteller.inc | 218 +++++++++++++++++++++--------------------- data/text/trader.inc | 28 +++--- 5 files changed, 210 insertions(+), 220 deletions(-) (limited to 'data') diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index f406d33fe..780017442 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -32,11 +32,13 @@ speak_to_bard: end yes_hear_song: setvar 0x8004, 0 + @ Give the player ear rape special ScrSpecial_PlayBardSong pause 60 special ScrSpecial_HasBardSongBeenChanged compare RESULT, FALSE - jumpeq prompt_write_lyrics @ Prompt new lyrics only if song hasn't been changed + @ Prompt new lyrics only if song hasn't been changed + jumpeq prompt_write_lyrics msgbox gTextBard_OhWhatAMovingSong, 4 release end @@ -60,6 +62,7 @@ write_lyrics: jumpeq dont_write_lyrics msgbox gTextBard_ThankYouKindly, 4 setvar 0x8004, 1 + @ Give the player ear rape again special ScrSpecial_PlayBardSong pause 60 msgbox gTextBard_WasThatHowYouWanted, MSGBOX_YESNO @@ -78,28 +81,26 @@ dont_write_lyrics: @ Hipster @------------------------------------------------------------------------------- -speak_to_hipster:: @ 81AE845 +speak_to_hipster: lock faceplayer setflag 2054 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0C5B, 4 - special sub_80F7C70 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE86A - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0CA7, 4 + msgbox gTextHipster_TheyCallMeTheHipster, 4 + special ScrSpecial_GetHipsterSpokenFlag + compare RESULT, FALSE + jumpeq hipster_first_time + msgbox gTextHipster_TaughtYouAlready, 4 release end - -MauvilleCity_PokemonCenter_1F_EventScript_1AE86A:: @ 81AE86A - special sub_80F7C90 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AE882 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D11, 4 +hipster_first_time: + special ScrSpecial_HipsterTeachWord + compare RESULT, TRUE @ TRUE if player learned a new word + jumpeq teach_new_word + msgbox gTextHipster_YouAlreadyKnowALot, 4 release end - -MauvilleCity_PokemonCenter_1F_EventScript_1AE882:: @ 81AE882 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0D75, 4 +teach_new_word: + msgbox gTextHipster_HaveYouHeardAbout, 4 special ScrSpecial_SetHipsterSpokenFlag release end @@ -110,93 +111,82 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AE882:: @ 81AE882 .include "data/text/trader.inc" -speak_to_trader:: @ 81AEBAB +speak_to_trader: lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE88F, 5 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA - special sub_8109C44 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3 - message MauvilleCity_PokemonCenter_1F_Text_1AE910 + msgbox gTextTrader_Introduction, MSGBOX_YESNO + compare RESULT, NO + jumpeq dont_want_to_trade + special ScrSpecial_GetTraderTradedFlag + compare RESULT, TRUE + jumpeq already_traded + message gTextTrader_MenuPrompt waittext - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC + jump do_trader_menu_get end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEBDA:: @ 81AEBDA - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE8C6, 2 +dont_want_to_trade: + msgbox gTextTrader_FeelUnwanted1, 2 end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEBE3:: @ 81AEBE3 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE8DF, 2 +already_traded: + msgbox gTextTrader_TradedAlready, 2 end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC:: @ 81AEBEC - special sub_8109E34 +do_trader_menu_get: + special ScrSpecial_TraderMenuGetDecoration waitstate compare 0x8004, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D + jumpeq cancelled_get_menu compare 0x8004, 65535 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC36 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE97C, 5 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC42 - special sub_8109C58 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 + jumpeq rare_item_cant_trade_away + msgbox gTextTrader_ItemOnceBelongedTo, MSGBOX_YESNO + compare RESULT, NO + jumpeq dont_want_item + special ScrSpecial_DoesPlayerHaveNoDecorations + compare RESULT, TRUE + jumpeq player_has_no_decorations + jump do_trader_menu_give end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC2D:: @ 81AEC2D - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE950, 2 +cancelled_get_menu:: @ 81AEC2D + msgbox gTextTrader_DontWantAnything, 2 end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC36:: @ 81AEC36 - message MauvilleCity_PokemonCenter_1F_Text_1AEB31 +rare_item_cant_trade_away:: @ 81AEC36 + message gTextTrader_ICantTradeThatOneAway waittext - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC + jump do_trader_menu_get end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC42:: @ 81AEC42 - message MauvilleCity_PokemonCenter_1F_Text_1AE910 +dont_want_item: + message gTextTrader_MenuPrompt waittext - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEBEC + jump do_trader_menu_get end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC4E:: @ 81AEC4E - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9B6, 2 +player_has_no_decorations:: @ 81AEC4E + msgbox gTextTrader_YouDontHaveDecorations, 2 end - -MauvilleCity_PokemonCenter_1F_EventScript_1AEC57:: @ 81AEC57 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AE9F8, 4 - special sub_8109CF0 +do_trader_menu_give:: @ 81AEC57 + msgbox gTextTrader_PickDecorationYoullTrade, 4 + special ScrSpecial_TraderMenuGiveDecoration waitstate compare 0x8006, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECA6 + jumpeq cancelled_give_menu compare 0x8006, 65535 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECAF - special sub_8109C90 + jumpeq decoration_is_in_use + special ScrSpecial_IsDecorationFull compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AECBD - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA9B, 5 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 - special sub_8109DE0 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAFB, 2 + jumpeq decorations_full + msgbox gTextTrader_SoWellTrade, MSGBOX_YESNO + compare RESULT, NO + jumpeq do_trader_menu_give + special ScrSpecial_TraderDoDecorationTrade + msgbox gTextTrader_ThenWellTrade, 2 end - -MauvilleCity_PokemonCenter_1F_EventScript_1AECA6:: @ 81AECA6 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA2B, 2 +cancelled_give_menu:: @ 81AECA6 + msgbox gTextTrader_FeelUnwanted2, 2 end - -MauvilleCity_PokemonCenter_1F_EventScript_1AECAF:: @ 81AECAF - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEAC3, 4 - jump MauvilleCity_PokemonCenter_1F_EventScript_1AEC57 +decoration_is_in_use:: @ 81AECAF + msgbox gTextTrader_InUseYouCantTradeIt, 4 + jump do_trader_menu_give end - -MauvilleCity_PokemonCenter_1F_EventScript_1AECBD:: @ 81AECBD - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEA57, 2 +decorations_full:: @ 81AECBD + msgbox gTextTrader_NoRoomForThis, 2 end @------------------------------------------------------------------------------- @@ -212,8 +202,8 @@ speak_to_storyteller:: @ 81B0816 setvar 0x800b, 0 lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_1AECC6, 5 - compare RESULT, 0 + msgbox gTextStoryteller_Introduction, MSGBOX_YESNO + compare RESULT, NO jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 specialval RESULT, sub_80F889C compare RESULT, 0 @@ -242,7 +232,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B0883:: @ 81B0883 MauvilleCity_PokemonCenter_1F_EventScript_1B0893:: @ 81B0893 msgbox MauvilleCity_PokemonCenter_1F_Text_1AEE50, 4 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF0A, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF0A, MSGBOX_YESNO compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B084F @@ -259,7 +249,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B08D3:: @ 81B08D3 msgbox MauvilleCity_PokemonCenter_1F_Text_1AED70, 4 MauvilleCity_PokemonCenter_1F_EventScript_1B08DB:: @ 81B08DB - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEEB4, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_1AEEB4, MSGBOX_YESNO compare RESULT, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 specialval RESULT, sub_80F88FC @@ -297,7 +287,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B091F:: @ 81B091F MauvilleCity_PokemonCenter_1F_EventScript_1B09EB:: @ 81B09EB lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_1B092A, 5 + msgbox MauvilleCity_PokemonCenter_1F_Text_1B092A, MSGBOX_YESNO compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C compare RESULT, 0 diff --git a/data/specials.inc b/data/specials.inc index 06ba22a23..cff97f455 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -107,9 +107,9 @@ gSpecials:: def_special ScrSpecial_GetCurrentMauvilleMan def_special ScrSpecial_HasBardSongBeenChanged def_special ScrSpecial_SaveBardSongLyrics - def_special sub_80F7C70 + def_special ScrSpecial_GetHipsterSpokenFlag def_special ScrSpecial_SetHipsterSpokenFlag - def_special sub_80F7C90 + def_special ScrSpecial_HipsterTeachWord def_special ScrSpecial_PlayBardSong def_special sub_80F83D0 def_special ScrSpecial_GenerateGiddyLine @@ -120,12 +120,12 @@ gSpecials:: def_special sub_80F88AC def_special sub_80F88FC def_special sub_80F88E0 - def_special sub_8109E34 - def_special sub_8109C44 - def_special sub_8109C58 - def_special sub_8109C90 - def_special sub_8109CF0 - def_special sub_8109DE0 + def_special ScrSpecial_TraderMenuGetDecoration + def_special ScrSpecial_GetTraderTradedFlag + def_special ScrSpecial_DoesPlayerHaveNoDecorations + def_special ScrSpecial_IsDecorationFull + def_special ScrSpecial_TraderMenuGiveDecoration + def_special ScrSpecial_TraderDoDecorationTrade def_special GetShroomishSizeRecordInfo def_special CompareShroomishSize def_special GetBarboachSizeRecordInfo diff --git a/data/text/hipster.inc b/data/text/hipster.inc index a30943d3a..630db02b2 100644 --- a/data/text/hipster.inc +++ b/data/text/hipster.inc @@ -1,19 +1,19 @@ -MauvilleCity_PokemonCenter_1F_Text_1B0C5B:: @ 81B0C5B +gTextHipster_TheyCallMeTheHipster:: @ 81B0C5B .string "Hey, yo! They call me the HIPSTER.\n" .string "I’ll teach you what’s hip and happening.$" -MauvilleCity_PokemonCenter_1F_Text_1B0CA7:: @ 81B0CA7 +gTextHipster_TaughtYouAlready:: @ 81B0CA7 .string "But, hey, I taught you what’s hip and\n" .string "happening already.\p" .string "I’d like to spread the good word to\n" .string "other folks.$" -MauvilleCity_PokemonCenter_1F_Text_1B0D11:: @ 81B0D11 +gTextHipster_YouAlreadyKnowALot:: @ 81B0D11 .string "But, hey, you already know a lot about\n" .string "what’s hip and happening.\p" .string "I’ve got nothing new to teach you!$" -MauvilleCity_PokemonCenter_1F_Text_1B0D75:: @ 81B0D75 +gTextHipster_HaveYouHeardAbout:: @ 81B0D75 .string "Hey, have you heard about\n" .string "“{STR_VAR_1}”?\p" .string "What’s it mean? Well...\n" diff --git a/data/text/storyteller.inc b/data/text/storyteller.inc index 3cfa8a698..ad131ec54 100644 --- a/data/text/storyteller.inc +++ b/data/text/storyteller.inc @@ -1,4 +1,4 @@ -MauvilleCity_PokemonCenter_1F_Text_1AECC6:: @ 81AECC6 +gTextStoryteller_Introduction:: @ 81AECC6 .string "I’m the STORYTELLER.\n" .string "I’ll tell you tales of legendary\l" .string "TRAINERS.\p" @@ -51,13 +51,13 @@ MauvilleCity_PokemonCenter_1F_Text_1AEFA5:: @ 81AEFA5 .string "in hearing my epic tales of legendary\l" .string "TRAINERS.$" -UnknownString_81AEFFC:: @ 81AEFFC +gTextStoryteller_Story1Title:: @ 81AEFFC .string "The Save-Happy TRAINER$" -UnknownString_81AF013:: @ 81AF013 +gTextStoryteller_Story1Action:: @ 81AF013 .string "Saved the game$" -UnknownString_81AF022:: @ 81AF022 +gTextStoryteller_Story1Text:: @ 81AF022 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER saved the game\n" @@ -65,13 +65,13 @@ UnknownString_81AF022:: @ 81AF022 .string "A more cautious TRAINER than\n" .string "{STR_VAR_3} one will never find!$" -UnknownString_81AF0A3:: @ 81AF0A3 +gTextStoryteller_Story2Title:: @ 81AF0A3 .string "The Trendsetter TRAINER$" -UnknownString_81AF0BB:: @ 81AF0BB +gTextStoryteller_Story2Action:: @ 81AF0BB .string "Started trends$" -UnknownString_81AF0CA:: @ 81AF0CA +gTextStoryteller_Story2Text:: @ 81AF0CA .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER started new trends\n" @@ -79,13 +79,13 @@ UnknownString_81AF0CA:: @ 81AF0CA .string "{STR_VAR_3} is setting trends for all\n" .string "the HOENN region!$" -UnknownString_81AF149:: @ 81AF149 +gTextStoryteller_Story3Title:: @ 81AF149 .string "The BERRY-Planting TRAINER$" -UnknownString_81AF164:: @ 81AF164 +gTextStoryteller_Story3Action:: @ 81AF164 .string "Planted BERRIES$" -UnknownString_81AF174:: @ 81AF174 +gTextStoryteller_Story3Text:: @ 81AF174 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER planted BERRIES\n" @@ -93,13 +93,13 @@ UnknownString_81AF174:: @ 81AF174 .string "{STR_VAR_3} is a legendary lover of\n" .string "BERRIES!$" -UnknownString_81AF1E5:: @ 81AF1E5 +gTextStoryteller_Story4Title:: @ 81AF1E5 .string "The BIKE-Loving TRAINER$" -UnknownString_81AF1FD:: @ 81AF1FD +gTextStoryteller_Story4Action:: @ 81AF1FD .string "Traded BIKES$" -UnknownString_81AF20A:: @ 81AF20A +gTextStoryteller_Story4Text:: @ 81AF20A .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER swapped BIKES\n" @@ -107,13 +107,13 @@ UnknownString_81AF20A:: @ 81AF20A .string "{STR_VAR_3} must love BIKES deeply\n" .string "and passionately!$" -UnknownString_81AF281:: @ 81AF281 +gTextStoryteller_Story5Title:: @ 81AF281 .string "The Interviewed TRAINER$" -UnknownString_81AF299:: @ 81AF299 +gTextStoryteller_Story5Action:: @ 81AF299 .string "Got interviewed$" -UnknownString_81AF2A9:: @ 81AF2A9 +gTextStoryteller_Story5Text:: @ 81AF2A9 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER got interviewed\n" @@ -121,26 +121,26 @@ UnknownString_81AF2A9:: @ 81AF2A9 .string "{STR_VAR_3} must be a TRAINER who’s\n" .string "attracting much attention!$" -UnknownString_81AF32C:: @ 81AF32C +gTextStoryteller_Story6Title:: @ 81AF32C .string "The Battle-Happy TRAINER$" -UnknownString_81AF345:: @ 81AF345 +gTextStoryteller_Story6Action:: @ 81AF345 .string "Battled$" -UnknownString_81AF34D:: @ 81AF34D +gTextStoryteller_Story6Text:: @ 81AF34D .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER battled {STR_VAR_1} times!\p" .string "{STR_VAR_3} must be a TRAINER who can\n" .string "never refuse a chance to battle!$" -UnknownString_81AF3D0:: @ 81AF3D0 +gTextStoryteller_Story7Title:: @ 81AF3D0 .string "The POKéMON-Catching TRAINER$" -UnknownString_81AF3ED:: @ 81AF3ED +gTextStoryteller_Story7Action:: @ 81AF3ED .string "Caught POKéMON$" -UnknownString_81AF3FC:: @ 81AF3FC +gTextStoryteller_Story7Text:: @ 81AF3FC .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER caught\n" @@ -148,13 +148,13 @@ UnknownString_81AF3FC:: @ 81AF3FC .string "{STR_VAR_3} is a legendary catcher of\n" .string "wild POKéMON!$" -UnknownString_81AF46D:: @ 81AF46D +gTextStoryteller_Story8Title:: @ 81AF46D .string "The Fishing TRAINER$" -UnknownString_81AF481:: @ 81AF481 +gTextStoryteller_Story8Action:: @ 81AF481 .string "Caught POKéMON with a ROD$" -UnknownString_81AF49B:: @ 81AF49B +gTextStoryteller_Story8Text:: @ 81AF49B .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER caught\n" @@ -162,13 +162,13 @@ UnknownString_81AF49B:: @ 81AF49B .string "{STR_VAR_3} is a legendary fishing\n" .string "expert!$" -UnknownString_81AF511:: @ 81AF511 +gTextStoryteller_Story9Title:: @ 81AF511 .string "The EGG-Warming TRAINER$" -UnknownString_81AF529:: @ 81AF529 +gTextStoryteller_Story9Action:: @ 81AF529 .string "Hatched EGGS$" -UnknownString_81AF536:: @ 81AF536 +gTextStoryteller_Story9Text:: @ 81AF536 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER hatched {STR_VAR_1} POKéMON\n" @@ -176,13 +176,13 @@ UnknownString_81AF536:: @ 81AF536 .string "{STR_VAR_3} is a legendary warmer\n" .string "of EGGS!$" -UnknownString_81AF5A9:: @ 81AF5A9 +gTextStoryteller_Story10Title:: @ 81AF5A9 .string "The Evolver TRAINER$" -UnknownString_81AF5BD:: @ 81AF5BD +gTextStoryteller_Story10Action:: @ 81AF5BD .string "Evolved POKéMON$" -UnknownString_81AF5CD:: @ 81AF5CD +gTextStoryteller_Story10Text:: @ 81AF5CD .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER made {STR_VAR_1} POKéMON\n" @@ -190,13 +190,13 @@ UnknownString_81AF5CD:: @ 81AF5CD .string "{STR_VAR_3} is the ultimate evolver\n" .string "of POKéMON!$" -UnknownString_81AF63F:: @ 81AF63F +gTextStoryteller_Story11Title:: @ 81AF63F .string "The POKéMON CENTER-Loving TRAINER$" -UnknownString_81AF661:: @ 81AF661 +gTextStoryteller_Story11Action:: @ 81AF661 .string "Used POKéMON CENTERS$" -UnknownString_81AF676:: @ 81AF676 +gTextStoryteller_Story11Text:: @ 81AF676 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER healed POKéMON\n" @@ -204,13 +204,13 @@ UnknownString_81AF676:: @ 81AF676 .string "There could be no greater lover of\n" .string "POKéMON CENTERS than {STR_VAR_3}!$" -UnknownString_81AF711:: @ 81AF711 +gTextStoryteller_Story12Title:: @ 81AF711 .string "The Homebody TRAINER$" -UnknownString_81AF726:: @ 81AF726 +gTextStoryteller_Story12Action:: @ 81AF726 .string "Rested POKéMON at home$" -UnknownString_81AF73D:: @ 81AF73D +gTextStoryteller_Story12Text:: @ 81AF73D .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER healed POKéMON\n" @@ -218,13 +218,13 @@ UnknownString_81AF73D:: @ 81AF73D .string "There could be no more of a homebody\n" .string "than {STR_VAR_3}!$" -UnknownString_81AF7BF:: @ 81AF7BF +gTextStoryteller_Story13Title:: @ 81AF7BF .string "The SAFARI-Loving TRAINER$" -UnknownString_81AF7D9:: @ 81AF7D9 +gTextStoryteller_Story13Action:: @ 81AF7D9 .string "Entered the SAFARI ZONE$" -UnknownString_81AF7F1:: @ 81AF7F1 +gTextStoryteller_Story13Text:: @ 81AF7F1 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER went into the SAFARI ZONE\n" @@ -232,13 +232,13 @@ UnknownString_81AF7F1:: @ 81AF7F1 .string "{STR_VAR_3} is a TRAINER whose wild side\n" .string "must come out in the SAFARI ZONE!$" -UnknownString_81AF88A:: @ 81AF88A +gTextStoryteller_Story14Title:: @ 81AF88A .string "The CUT-Frenzy TRAINER$" -UnknownString_81AF8A1:: @ 81AF8A1 +gTextStoryteller_Story14Action:: @ 81AF8A1 .string "Used CUT$" -UnknownString_81AF8AA:: @ 81AF8AA +gTextStoryteller_Story14Text:: @ 81AF8AA .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER used CUT\n" @@ -246,13 +246,13 @@ UnknownString_81AF8AA:: @ 81AF8AA .string "{STR_VAR_3} is a TRAINER who just must\n" .string "love to CUT!$" -UnknownString_81AF91B:: @ 81AF91B +gTextStoryteller_Story15Title:: @ 81AF91B .string "The ROCK-SMASHING TRAINER$" -UnknownString_81AF935:: @ 81AF935 +gTextStoryteller_Story15Action:: @ 81AF935 .string "Smashed rocks$" -UnknownString_81AF943:: @ 81AF943 +gTextStoryteller_Story15Text:: @ 81AF943 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER used ROCK SMASH\n" @@ -260,13 +260,13 @@ UnknownString_81AF943:: @ 81AF943 .string "{STR_VAR_3} must be a TRAINER who\n" .string "can’t leave a stone unsmashed!$" -UnknownString_81AF9C8:: @ 81AF9C8 +gTextStoryteller_Story16Title:: @ 81AF9C8 .string "The Move-Loving TRAINER$" -UnknownString_81AF9E0:: @ 81AF9E0 +gTextStoryteller_Story16Action:: @ 81AF9E0 .string "Moved the SECRET BASE$" -UnknownString_81AF9F6:: @ 81AF9F6 +gTextStoryteller_Story16Text:: @ 81AF9F6 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER moved the SECRET BASE\n" @@ -274,13 +274,13 @@ UnknownString_81AF9F6:: @ 81AF9F6 .string "{STR_VAR_3} is a TRAINER who loves\n" .string "to move houses often!$" -UnknownString_81AFA79:: @ 81AFA79 +gTextStoryteller_Story17Title:: @ 81AFA79 .string "The SPLASH-Happy TRAINER$" -UnknownString_81AFA92:: @ 81AFA92 +gTextStoryteller_Story17Action:: @ 81AFA92 .string "Used SPLASH$" -UnknownString_81AFA9E:: @ 81AFA9E +gTextStoryteller_Story17Text:: @ 81AFA9E .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER used SPLASH\n" @@ -288,13 +288,13 @@ UnknownString_81AFA9E:: @ 81AFA9E .string "{STR_VAR_3} is a TRAINER who must love\n" .string "SPLASHING around!$" -UnknownString_81AFB17:: @ 81AFB17 +gTextStoryteller_Story18Title:: @ 81AFB17 .string "The Tenacious TRAINER$" -UnknownString_81AFB2D:: @ 81AFB2D +gTextStoryteller_Story18Action:: @ 81AFB2D .string "Resorted to using STRUGGLE$" -UnknownString_81AFB48:: @ 81AFB48 +gTextStoryteller_Story18Text:: @ 81AFB48 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER had to rely on STRUGGLE\n" @@ -302,13 +302,13 @@ UnknownString_81AFB48:: @ 81AFB48 .string "{STR_VAR_3} is a tenacious TRAINER\n" .string "who never gives in to adversity!$" -UnknownString_81AFBD8:: @ 81AFBD8 +gTextStoryteller_Story19Title:: @ 81AFBD8 .string "The SLOT Champ$" -UnknownString_81AFBE7:: @ 81AFBE7 +gTextStoryteller_Story19Action:: @ 81AFBE7 .string "Won the jackpot on the SLOTS$" -UnknownString_81AFC04:: @ 81AFC04 +gTextStoryteller_Story19Text:: @ 81AFC04 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER won the jackpot on\n" @@ -316,13 +316,13 @@ UnknownString_81AFC04:: @ 81AFC04 .string "{STR_VAR_3} is a TRAINER who was lucky\n" .string "on the SLOTS!$" -UnknownString_81AFC8A:: @ 81AFC8A +gTextStoryteller_Story20Title:: @ 81AFC8A .string "The ROULETTE Champ$" -UnknownString_81AFC9D:: @ 81AFC9D +gTextStoryteller_Story20Action:: @ 81AFC9D .string "Had consecutive ROULETTE wins of$" -UnknownString_81AFCBE:: @ 81AFCBE +gTextStoryteller_Story20Text:: @ 81AFCBE .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER won in ROULETTE\n" @@ -330,13 +330,13 @@ UnknownString_81AFCBE:: @ 81AFCBE .string "{STR_VAR_3} was lucky when the ball\n" .string "bounced in ROULETTE!$" -UnknownString_81AFD44:: @ 81AFD44 +gTextStoryteller_Story21Title:: @ 81AFD44 .string "The BATTLE TOWER Challenger$" -UnknownString_81AFD60:: @ 81AFD60 +gTextStoryteller_Story21Action:: @ 81AFD60 .string "Took the BATTLE TOWER challenge$" -UnknownString_81AFD80:: @ 81AFD80 +gTextStoryteller_Story21Text:: @ 81AFD80 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER took the BATTLE TOWER\n" @@ -344,13 +344,13 @@ UnknownString_81AFD80:: @ 81AFD80 .string "{STR_VAR_3} is a TRAINER who aspires\n" .string "for excellence in the BATTLE TOWER!$" -UnknownString_81AFE1D:: @ 81AFE1D +gTextStoryteller_Story22Title:: @ 81AFE1D .string "The Blend-Loving TRAINER$" -UnknownString_81AFE36:: @ 81AFE36 +gTextStoryteller_Story22Action:: @ 81AFE36 .string "Made {POKEBLOCK}S$" -UnknownString_81AFE42:: @ 81AFE42 +gTextStoryteller_Story22Text:: @ 81AFE42 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER made {POKEBLOCK}S\n" @@ -358,13 +358,13 @@ UnknownString_81AFE42:: @ 81AFE42 .string "There is none better at using a BERRY\n" .string "BLENDER than {STR_VAR_3}!$" -UnknownString_81AFEC2:: @ 81AFEC2 +gTextStoryteller_Story23Title:: @ 81AFEC2 .string "The CONTEST-Loving TRAINER$" -UnknownString_81AFEDD:: @ 81AFEDD +gTextStoryteller_Story23Action:: @ 81AFEDD .string "Entered CONTESTS$" -UnknownString_81AFEEE:: @ 81AFEEE +gTextStoryteller_Story23Text:: @ 81AFEEE .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER entered CONTESTS\n" @@ -372,13 +372,13 @@ UnknownString_81AFEEE:: @ 81AFEEE .string "{STR_VAR_3} must love showing off\n" .string "POKéMON to others!$" -UnknownString_81AFF68:: @ 81AFF68 +gTextStoryteller_Story24Title:: @ 81AFF68 .string "The CONTEST Master$" -UnknownString_81AFF7B:: @ 81AFF7B +gTextStoryteller_Story24Action:: @ 81AFF7B .string "Won CONTESTS$" -UnknownString_81AFF88:: @ 81AFF88 +gTextStoryteller_Story24Text:: @ 81AFF88 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER won CONTESTS\n" @@ -386,13 +386,13 @@ UnknownString_81AFF88:: @ 81AFF88 .string "{STR_VAR_3} must be an incredible\n" .string "CONTEST master!$" -UnknownString_81AFFFB:: @ 81AFFFB +gTextStoryteller_Story25Title:: @ 81AFFFB .string "The Happy Shopper$" -UnknownString_81B000D:: @ 81B000D +gTextStoryteller_Story25Action:: @ 81B000D .string "Shopped$" -UnknownString_81B0015:: @ 81B0015 +gTextStoryteller_Story25Text:: @ 81B0015 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER bought items in shops\n" @@ -400,13 +400,13 @@ UnknownString_81B0015:: @ 81B0015 .string "{STR_VAR_3} must be one of those\n" .string "people who are born to shop.$" -UnknownString_81B009D:: @ 81B009D +gTextStoryteller_Story26Title:: @ 81B009D .string "The Item-Finding TRAINER$" -UnknownString_81B00B6:: @ 81B00B6 +gTextStoryteller_Story26Action:: @ 81B00B6 .string "Used an ITEMFINDER$" -UnknownString_81B00C9:: @ 81B00C9 +gTextStoryteller_Story26Text:: @ 81B00C9 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER used an ITEMFINDER\n" @@ -414,13 +414,13 @@ UnknownString_81B00C9:: @ 81B00C9 .string "{STR_VAR_3} must enjoy scouring the\n" .string "ground for hidden items!$" -UnknownString_81B014D:: @ 81B014D +gTextStoryteller_Story27Title:: @ 81B014D .string "The Rain-Soaked TRAINER$" -UnknownString_81B0165:: @ 81B0165 +gTextStoryteller_Story27Action:: @ 81B0165 .string "Got rained on$" -UnknownString_81B0173:: @ 81B0173 +gTextStoryteller_Story27Text:: @ 81B0173 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER got soaked by rain\n" @@ -428,13 +428,13 @@ UnknownString_81B0173:: @ 81B0173 .string "{STR_VAR_3}’s charisma must even\n" .string "attract rain!$" -UnknownString_81B01E9:: @ 81B01E9 +gTextStoryteller_Story28Title:: @ 81B01E9 .string "The Avid POKéDEX Reader$" -UnknownString_81B0201:: @ 81B0201 +gTextStoryteller_Story28Action:: @ 81B0201 .string "Checked a POKéDEX$" -UnknownString_81B0213:: @ 81B0213 +gTextStoryteller_Story28Text:: @ 81B0213 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER checked a POKéDEX\n" @@ -442,13 +442,13 @@ UnknownString_81B0213:: @ 81B0213 .string "{STR_VAR_3} must love inspecting\n" .string "POKéMON in a POKéDEX!$" -UnknownString_81B0290:: @ 81B0290 +gTextStoryteller_Story29Title:: @ 81B0290 .string "The RIBBON Collector$" -UnknownString_81B02A5:: @ 81B02A5 +gTextStoryteller_Story29Action:: @ 81B02A5 .string "Received RIBBONS$" -UnknownString_81B02B6:: @ 81B02B6 +gTextStoryteller_Story29Text:: @ 81B02B6 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER received RIBBONS\n" @@ -456,13 +456,13 @@ UnknownString_81B02B6:: @ 81B02B6 .string "{STR_VAR_3} must be a TRAINER who\n" .string "loves to collect RIBBONS!$" -UnknownString_81B0337:: @ 81B0337 +gTextStoryteller_Story30Title:: @ 81B0337 .string "The Ledge-Jumping TRAINER$" -UnknownString_81B0351:: @ 81B0351 +gTextStoryteller_Story30Action:: @ 81B0351 .string "Jumped down ledges$" -UnknownString_81B0364:: @ 81B0364 +gTextStoryteller_Story30Text:: @ 81B0364 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER jumped down ledges\n" @@ -470,26 +470,26 @@ UnknownString_81B0364:: @ 81B0364 .string "If there’s a ledge to be jumped,\n" .string "{STR_VAR_3} can’t ignore it!$" -UnknownString_81B03E9:: @ 81B03E9 +gTextStoryteller_Story31Title:: @ 81B03E9 .string "The Legendary TV Viewer$" -UnknownString_81B0401:: @ 81B0401 +gTextStoryteller_Story31Action:: @ 81B0401 .string "Watched TV$" -UnknownString_81B040C:: @ 81B040C +gTextStoryteller_Story31Text:: @ 81B040C .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER watched TV\n" .string "{STR_VAR_1} times!\p" .string "{STR_VAR_3} must love watching TV!$" -UnknownString_81B046E:: @ 81B046E +gTextStoryteller_Story32Title:: @ 81B046E .string "The Time-Conscious TRAINER$" -UnknownString_81B0489:: @ 81B0489 +gTextStoryteller_Story32Action:: @ 81B0489 .string "Checked the time$" -UnknownString_81B049A:: @ 81B049A +gTextStoryteller_Story32Text:: @ 81B049A .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER checked the time\n" @@ -497,13 +497,13 @@ UnknownString_81B049A:: @ 81B049A .string "{STR_VAR_3} must be a punctual TRAINER\n" .string "who’s conscious of the time.$" -UnknownString_81B0523:: @ 81B0523 +gTextStoryteller_Story33Title:: @ 81B0523 .string "The POKéMON LOTTERY Wizard$" -UnknownString_81B053E:: @ 81B053E +gTextStoryteller_Story33Action:: @ 81B053E .string "Won POKéMON LOTTERIES$" -UnknownString_81B0554:: @ 81B0554 +gTextStoryteller_Story33Text:: @ 81B0554 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER won POKéMON LOTTERIES\n" @@ -511,13 +511,13 @@ UnknownString_81B0554:: @ 81B0554 .string "{STR_VAR_3} must have many friends\n" .string "to trade POKéMON with!$" -UnknownString_81B05D8:: @ 81B05D8 +gTextStoryteller_Story34Title:: @ 81B05D8 .string "The DAY CARE-Using Trainer$" -UnknownString_81B05F3:: @ 81B05F3 +gTextStoryteller_Story34Action:: @ 81B05F3 .string "Left POKéMON at the DAY CARE$" -UnknownString_81B0610:: @ 81B0610 +gTextStoryteller_Story34Text:: @ 81B0610 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER left POKéMON with the\n" @@ -525,13 +525,13 @@ UnknownString_81B0610:: @ 81B0610 .string "{STR_VAR_3} must be a real go-getter\n" .string "who raises POKéMON aggressively!$" -UnknownString_81B06A9:: @ 81B06A9 +gTextStoryteller_Story35Title:: @ 81B06A9 .string "The CABLE CAR-Loving TRAINER$" -UnknownString_81B06C6:: @ 81B06C6 +gTextStoryteller_Story35Action:: @ 81B06C6 .string "Rode the CABLE CAR$" -UnknownString_81B06D9:: @ 81B06D9 +gTextStoryteller_Story35Text:: @ 81B06D9 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER rode the CABLE CAR\n" @@ -539,13 +539,13 @@ UnknownString_81B06D9:: @ 81B06D9 .string "{STR_VAR_3} must be a busy TRAINER\n" .string "who’s up and down all the time!$" -UnknownString_81B0763:: @ 81B0763 +gTextStoryteller_Story36Title:: @ 81B0763 .string "The Hot Spring-Loving TRAINER$" -UnknownString_81B0781:: @ 81B0781 +gTextStoryteller_Story36Action:: @ 81B0781 .string "Bathed in hot springs$" -UnknownString_81B0797:: @ 81B0797 +gTextStoryteller_Story36Text:: @ 81B0797 .string "This is a tale of a TRAINER\n" .string "named {STR_VAR_3}.\p" .string "This TRAINER bathed in hot springs\n" diff --git a/data/text/trader.inc b/data/text/trader.inc index dba63bcf8..599344091 100644 --- a/data/text/trader.inc +++ b/data/text/trader.inc @@ -1,57 +1,57 @@ -MauvilleCity_PokemonCenter_1F_Text_1AE88F:: @ 81AE88F +gTextTrader_Introduction:: @ 81AE88F .string "Hi, I’m the TRADER.\n" .string "Want to trade decorations with me?$" -MauvilleCity_PokemonCenter_1F_Text_1AE8C6:: @ 81AE8C6 +gTextTrader_FeelUnwanted1:: @ 81AE8C6 .string "Oh...\n" .string "I feel unwanted...$" -MauvilleCity_PokemonCenter_1F_Text_1AE8DF:: @ 81AE8DF +gTextTrader_TradedAlready:: @ 81AE8DF .string "But we’ve traded decorations already,\n" .string "you and I.$" -MauvilleCity_PokemonCenter_1F_Text_1AE910:: @ 81AE910 +gTextTrader_MenuPrompt:: @ 81AE910 .string "If you see any decorative item that\n" .string "you want of mine, speak up.$" -MauvilleCity_PokemonCenter_1F_Text_1AE950:: @ 81AE950 +gTextTrader_DontWantAnything:: @ 81AE950 .string "You don’t want anything?\n" .string "I feel unwanted...$" -MauvilleCity_PokemonCenter_1F_Text_1AE97C:: @ 81AE97C +gTextTrader_ItemOnceBelongedTo:: @ 81AE97C .string "That decorative item once belonged\n" .string "to {STR_VAR_1}.\p" .string "Do you want it?$" -MauvilleCity_PokemonCenter_1F_Text_1AE9B6:: @ 81AE9B6 +gTextTrader_YouDontHaveDecorations:: @ 81AE9B6 .string "Uh... Wait a second. You don’t have a\n" .string "single piece of decoration!$" -MauvilleCity_PokemonCenter_1F_Text_1AE9F8:: @ 81AE9F8 +gTextTrader_PickDecorationYoullTrade:: @ 81AE9F8 .string "Okay, pick the decoration that you’ll\n" .string "trade to me.$" -MauvilleCity_PokemonCenter_1F_Text_1AEA2B:: @ 81AEA2B +gTextTrader_FeelUnwanted2:: @ 81AEA2B .string "You won’t trade with me?\n" .string "I feel unwanted...$" -MauvilleCity_PokemonCenter_1F_Text_1AEA57:: @ 81AEA57 +gTextTrader_NoRoomForThis:: @ 81AEA57 .string "You’ve got all the {STR_VAR_2}S that can\n" .string "be stored. You’ve no room for this.$" -MauvilleCity_PokemonCenter_1F_Text_1AEA9B:: @ 81AEA9B +gTextTrader_SoWellTrade:: @ 81AEA9B .string "Okay, so we’ll trade my {STR_VAR_3}\n" .string "for your {STR_VAR_2}?$" -MauvilleCity_PokemonCenter_1F_Text_1AEAC3:: @ 81AEAC3 +gTextTrader_InUseYouCantTradeIt:: @ 81AEAC3 .string "That piece of decoration is in use.\n" .string "You can’t trade it.$" -MauvilleCity_PokemonCenter_1F_Text_1AEAFB:: @ 81AEAFB +gTextTrader_ThenWellTrade:: @ 81AEAFB .string "Then we’ll trade!\n" .string "I’ll send my decoration to your PC.$" -MauvilleCity_PokemonCenter_1F_Text_1AEB31:: @ 81AEB31 +gTextTrader_ICantTradeThatOneAway:: @ 81AEB31 .string "Oops! Sorry!\n" .string "That’s a really rare piece of decoration.\l" .string "I can’t trade that one away!\p" -- cgit v1.2.3 From 19e06e09c9579c8230c66d6d0d267c5b722637e5 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 24 Aug 2017 19:37:36 -0500 Subject: actually fix build --- data/scripts/mauville_man.inc | 26 +++++++++++++------------- data/text/storyteller.inc | 18 +++++++++--------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'data') diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 780017442..6a8f5f051 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -204,13 +204,13 @@ speak_to_storyteller:: @ 81B0816 faceplayer msgbox gTextStoryteller_Introduction, MSGBOX_YESNO compare RESULT, NO - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 + jumpeq dont_hear_tale specialval RESULT, sub_80F889C compare RESULT, 0 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B08D3 MauvilleCity_PokemonCenter_1F_EventScript_1B084F:: @ 81B084F - message MauvilleCity_PokemonCenter_1F_Text_1AED35 + message gTextStoryteller_WhichTale waittext special sub_80F8874 waitstate @@ -227,12 +227,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B084F:: @ 81B084F MauvilleCity_PokemonCenter_1F_EventScript_1B0883:: @ 81B0883 compare 0x8008, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 + jumpeq dont_hear_tale jump MauvilleCity_PokemonCenter_1F_EventScript_1B08AE MauvilleCity_PokemonCenter_1F_EventScript_1B0893:: @ 81B0893 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEE50, 4 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF0A, MSGBOX_YESNO + msgbox gTextStoryteller_CouldThereBeOtherTrainers, 4 + msgbox gTextStoryteller_HearAnotherLegendaryTale, MSGBOX_YESNO compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B084F @@ -246,34 +246,34 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B08AE:: @ 81B08AE jump MauvilleCity_PokemonCenter_1F_EventScript_1B08DB MauvilleCity_PokemonCenter_1F_EventScript_1B08D3:: @ 81B08D3 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AED70, 4 + msgbox gTextStoryteller_ButIKnowOfNoLegendaryTrainers, 4 MauvilleCity_PokemonCenter_1F_EventScript_1B08DB:: @ 81B08DB - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEEB4, MSGBOX_YESNO + msgbox gTextStoryteller_HaveYouAnyTales, MSGBOX_YESNO compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0914 + jumpeq dont_hear_tale specialval RESULT, sub_80F88FC compare RESULT, 1 jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0909 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEF49, 4 + msgbox gTextStoryteller_ImNotSatisfied, 4 closebutton release end MauvilleCity_PokemonCenter_1F_EventScript_1B0909:: @ 81B0909 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEDE8, 4 + msgbox gTextStoryteller_BirthOfANewLegend, 4 closebutton release end -MauvilleCity_PokemonCenter_1F_EventScript_1B0914:: @ 81B0914 - msgbox MauvilleCity_PokemonCenter_1F_Text_1AED1D, 4 +dont_hear_tale:: @ 81B0914 + msgbox gTextStoryteller_OhIFeelStifled, 4 closebutton release end MauvilleCity_PokemonCenter_1F_EventScript_1B091F:: @ 81B091F - msgbox MauvilleCity_PokemonCenter_1F_Text_1AEFA5, 4 + msgbox gTextStoryteller_WishMorePeopleWould, 4 closebutton release end diff --git a/data/text/storyteller.inc b/data/text/storyteller.inc index ad131ec54..437a1fa21 100644 --- a/data/text/storyteller.inc +++ b/data/text/storyteller.inc @@ -4,21 +4,21 @@ gTextStoryteller_Introduction:: @ 81AECC6 .string "TRAINERS.\p" .string "Will you hear my tale?$" -MauvilleCity_PokemonCenter_1F_Text_1AED1D:: @ 81AED1D +gTextStoryteller_OhIFeelStifled:: @ 81AED1D .string "Oh...\n" .string "I feel stifled...$" -MauvilleCity_PokemonCenter_1F_Text_1AED35:: @ 81AED35 +gTextStoryteller_WhichTale:: @ 81AED35 .string "I know of these legends.\n" .string "Which tale will you have me tell?$" -MauvilleCity_PokemonCenter_1F_Text_1AED70:: @ 81AED70 +gTextStoryteller_ButIKnowOfNoLegendaryTrainers:: @ 81AED70 .string "But, I know of no legendary TRAINERS.\n" .string "Hence, I know no tales.\p" .string "Where does one find a TRAINER worthy\n" .string "of a legendary tale?$" -MauvilleCity_PokemonCenter_1F_Text_1AEDE8:: @ 81AEDE8 +gTextStoryteller_BirthOfANewLegend:: @ 81AEDE8 .string "What’s that?!\n" .string "You... You...\p" .string "{STR_VAR_2}\n" @@ -26,27 +26,27 @@ MauvilleCity_PokemonCenter_1F_Text_1AEDE8:: @ 81AEDE8 .string "That is indeed magnificent!\n" .string "It’s the birth of a new legend!$" -MauvilleCity_PokemonCenter_1F_Text_1AEE50:: @ 81AEE50 +gTextStoryteller_CouldThereBeOtherTrainers:: @ 81AEE50 .string "It gets me thinking, could there be\n" .string "other TRAINERS with more impressive\l" .string "legends awaiting discovery?$" -MauvilleCity_PokemonCenter_1F_Text_1AEEB4:: @ 81AEEB4 +gTextStoryteller_HaveYouAnyTales:: @ 81AEEB4 .string "Are you a TRAINER?\p" .string "Then tell me, have you any tales that\n" .string "are even remotely legendary?$" -MauvilleCity_PokemonCenter_1F_Text_1AEF0A:: @ 81AEF0A +gTextStoryteller_HearAnotherLegendaryTale:: @ 81AEF0A .string "Incidentally... Would you care to hear\n" .string "another legendary tale?$" -MauvilleCity_PokemonCenter_1F_Text_1AEF49:: @ 81AEF49 +gTextStoryteller_ImNotSatisfied:: @ 81AEF49 .string "Hmm...\n" .string "I’m not satisfied...\p" .string "I wish you would bring me news worthy\n" .string "of being called a legend.$" -MauvilleCity_PokemonCenter_1F_Text_1AEFA5:: @ 81AEFA5 +gTextStoryteller_WishMorePeopleWould:: @ 81AEFA5 .string "I wish more people would be interested\n" .string "in hearing my epic tales of legendary\l" .string "TRAINERS.$" -- cgit v1.2.3 From 8c57ef0fad270bc795d0b64a75d96fafc0f63513 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 24 Aug 2017 20:50:39 -0500 Subject: finish labeling script --- data/scripts/mauville_man.inc | 161 +++++++++++++++++++----------------------- data/specials.inc | 14 ++-- data/text/giddy.inc | 8 +-- 3 files changed, 84 insertions(+), 99 deletions(-) (limited to 'data') diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 6a8f5f051..239c360dc 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -14,7 +14,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744 case MAUVILLE_MAN_HIPSTER, speak_to_hipster case MAUVILLE_MAN_TRADER, speak_to_trader case MAUVILLE_MAN_STORYTELLER, speak_to_storyteller - case MAUVILLE_MAN_GIDDY, MauvilleCity_PokemonCenter_1F_EventScript_1B09EB + case MAUVILLE_MAN_GIDDY, speak_to_giddy end @------------------------------------------------------------------------------- @@ -145,10 +145,10 @@ do_trader_menu_get: jumpeq player_has_no_decorations jump do_trader_menu_give end -cancelled_get_menu:: @ 81AEC2D +cancelled_get_menu: msgbox gTextTrader_DontWantAnything, 2 end -rare_item_cant_trade_away:: @ 81AEC36 +rare_item_cant_trade_away: message gTextTrader_ICantTradeThatOneAway waittext jump do_trader_menu_get @@ -158,10 +158,10 @@ dont_want_item: waittext jump do_trader_menu_get end -player_has_no_decorations:: @ 81AEC4E +player_has_no_decorations: msgbox gTextTrader_YouDontHaveDecorations, 2 end -do_trader_menu_give:: @ 81AEC57 +do_trader_menu_give: msgbox gTextTrader_PickDecorationYoullTrade, 4 special ScrSpecial_TraderMenuGiveDecoration waitstate @@ -178,14 +178,14 @@ do_trader_menu_give:: @ 81AEC57 special ScrSpecial_TraderDoDecorationTrade msgbox gTextTrader_ThenWellTrade, 2 end -cancelled_give_menu:: @ 81AECA6 +cancelled_give_menu: msgbox gTextTrader_FeelUnwanted2, 2 end -decoration_is_in_use:: @ 81AECAF +decoration_is_in_use: msgbox gTextTrader_InUseYouCantTradeIt, 4 jump do_trader_menu_give end -decorations_full:: @ 81AECBD +decorations_full: msgbox gTextTrader_NoRoomForThis, 2 end @@ -195,7 +195,7 @@ decorations_full:: @ 81AECBD .include "data/text/storyteller.inc" -speak_to_storyteller:: @ 81B0816 +speak_to_storyteller: setvar 0x8008, 0 setvar 0x8009, 0 setvar 0x800a, 0 @@ -204,75 +204,66 @@ speak_to_storyteller:: @ 81B0816 faceplayer msgbox gTextStoryteller_Introduction, MSGBOX_YESNO compare RESULT, NO - jumpeq dont_hear_tale - specialval RESULT, sub_80F889C - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B08D3 - -MauvilleCity_PokemonCenter_1F_EventScript_1B084F:: @ 81B084F + jumpeq dont_hear_story + specialval RESULT, ScrSpecial_StorytellerGetFreeStorySlot + compare RESULT, 0 @ If slot is 0, then the list is empty + jumpeq no_stories_recorded +choose_story: message gTextStoryteller_WhichTale waittext - special sub_80F8874 + special ScrSpecial_StorytellerStoryListMenu waitstate - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0883 + compare RESULT, FALSE + jumpeq cancel_story_menu setvar 0x8008, 1 - special sub_80F8888 + special ScrSpecial_StorytellerDisplayStory waittext waitbutton - specialval RESULT, sub_80F88AC - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0893 - jump MauvilleCity_PokemonCenter_1F_EventScript_1B0909 - -MauvilleCity_PokemonCenter_1F_EventScript_1B0883:: @ 81B0883 + specialval RESULT, ScrSpecial_StorytellerUpdateStat + compare RESULT, FALSE + jumpeq no_stat_update + jump stat_update +cancel_story_menu: compare 0x8008, 0 - jumpeq dont_hear_tale - jump MauvilleCity_PokemonCenter_1F_EventScript_1B08AE - -MauvilleCity_PokemonCenter_1F_EventScript_1B0893:: @ 81B0893 + jumpeq dont_hear_story + jump yes_hear_story +no_stat_update: msgbox gTextStoryteller_CouldThereBeOtherTrainers, 4 msgbox gTextStoryteller_HearAnotherLegendaryTale, MSGBOX_YESNO - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B084F - -MauvilleCity_PokemonCenter_1F_EventScript_1B08AE:: @ 81B08AE - specialval RESULT, sub_80F88E0 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F - specialval RESULT, sub_80F889C + compare RESULT, YES + jumpeq choose_story +yes_hear_story: + specialval RESULT, ScrSpecial_HasStorytellerAlreadyRecorded + compare RESULT, TRUE + jumpeq cant_record_story @ already recorded story + specialval RESULT, ScrSpecial_StorytellerGetFreeStorySlot compare RESULT, 4 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B091F - jump MauvilleCity_PokemonCenter_1F_EventScript_1B08DB - -MauvilleCity_PokemonCenter_1F_EventScript_1B08D3:: @ 81B08D3 + jumpeq cant_record_story @ story list is full + jump prompt_record_story +no_stories_recorded: msgbox gTextStoryteller_ButIKnowOfNoLegendaryTrainers, 4 - -MauvilleCity_PokemonCenter_1F_EventScript_1B08DB:: @ 81B08DB +prompt_record_story: msgbox gTextStoryteller_HaveYouAnyTales, MSGBOX_YESNO - compare RESULT, 0 - jumpeq dont_hear_tale - specialval RESULT, sub_80F88FC - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0909 + compare RESULT, NO + jumpeq dont_hear_story + specialval RESULT, ScrSpecial_StorytellerInitializeRandomStat + compare RESULT, TRUE + jumpeq stat_update msgbox gTextStoryteller_ImNotSatisfied, 4 closebutton release end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0909:: @ 81B0909 +stat_update: msgbox gTextStoryteller_BirthOfANewLegend, 4 closebutton release end - -dont_hear_tale:: @ 81B0914 +dont_hear_story: msgbox gTextStoryteller_OhIFeelStifled, 4 closebutton release end - -MauvilleCity_PokemonCenter_1F_EventScript_1B091F:: @ 81B091F +cant_record_story: msgbox gTextStoryteller_WishMorePeopleWould, 4 closebutton release @@ -284,55 +275,49 @@ MauvilleCity_PokemonCenter_1F_EventScript_1B091F:: @ 81B091F .include "data/text/giddy.inc" -MauvilleCity_PokemonCenter_1F_EventScript_1B09EB:: @ 81B09EB +speak_to_giddy: lock faceplayer - msgbox MauvilleCity_PokemonCenter_1F_Text_1B092A, MSGBOX_YESNO - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A6F + msgbox gTextGiddy_Introduction, MSGBOX_YESNO + compare RESULT, YES + jumpeq yes_hear_giddy + compare RESULT, NO + jumpeq dont_hear_giddy end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A0C:: @ 81B0A0C - special sub_80F7CC8 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A79 +yes_hear_giddy: + special ScrSpecial_GiddyShouldTellAnotherTale + compare RESULT, TRUE + jumpeq tell_giddy_tale + compare RESULT, FALSE + jumpeq bye_bye end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A26:: @ 81B0A26 - special sub_80F7CC8 - compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A40 - compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A79 +tell_another_giddy_tale: + special ScrSpecial_GiddyShouldTellAnotherTale + compare RESULT, TRUE + jumpeq also_i_was_thinking + compare RESULT, FALSE + jumpeq bye_bye end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A40:: @ 81B0A40 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B0998, 4 - jump MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E +also_i_was_thinking: + msgbox gTextGiddy_AlsoIWasThinking, 4 + jump tell_giddy_tale end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A4E:: @ 81B0A4E +tell_giddy_tale: special ScrSpecial_GenerateGiddyLine special ShowFieldMessageStringVar4 waittext yesnobox 20, 8 compare RESULT, 1 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A26 + jumpeq tell_another_giddy_tale compare RESULT, 0 - jumpeq MauvilleCity_PokemonCenter_1F_EventScript_1B0A26 + jumpeq tell_another_giddy_tale end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A6F:: @ 81B0A6F - msgbox MauvilleCity_PokemonCenter_1F_Text_1B097C, 4 +dont_hear_giddy: + msgbox gTextGiddy_YouveDeflatedMe, 4 release end - -MauvilleCity_PokemonCenter_1F_EventScript_1B0A79:: @ 81B0A79 - msgbox MauvilleCity_PokemonCenter_1F_Text_1B09B0, 4 +bye_bye: + msgbox gTextGiddy_ByeBye, 4 release end diff --git a/data/specials.inc b/data/specials.inc index cff97f455..a17bc943a 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -113,13 +113,13 @@ gSpecials:: def_special ScrSpecial_PlayBardSong def_special sub_80F83D0 def_special ScrSpecial_GenerateGiddyLine - def_special sub_80F7CC8 - def_special sub_80F889C - def_special sub_80F8888 - def_special sub_80F8874 - def_special sub_80F88AC - def_special sub_80F88FC - def_special sub_80F88E0 + def_special ScrSpecial_GiddyShouldTellAnotherTale + def_special ScrSpecial_StorytellerGetFreeStorySlot + def_special ScrSpecial_StorytellerDisplayStory + def_special ScrSpecial_StorytellerStoryListMenu + def_special ScrSpecial_StorytellerUpdateStat + def_special ScrSpecial_StorytellerInitializeRandomStat + def_special ScrSpecial_HasStorytellerAlreadyRecorded def_special ScrSpecial_TraderMenuGetDecoration def_special ScrSpecial_GetTraderTradedFlag def_special ScrSpecial_DoesPlayerHaveNoDecorations diff --git a/data/text/giddy.inc b/data/text/giddy.inc index 040ef2ae5..a763776bf 100644 --- a/data/text/giddy.inc +++ b/data/text/giddy.inc @@ -1,16 +1,16 @@ -MauvilleCity_PokemonCenter_1F_Text_1B092A:: @ 81B092A +gTextGiddy_Introduction:: @ 81B092A .string "I’m GIDDY!\n" .string "I have a scintillating story for you!\p" .string "Would you like to hear my story?$" -MauvilleCity_PokemonCenter_1F_Text_1B097C:: @ 81B097C +gTextGiddy_YouveDeflatedMe:: @ 81B097C .string "Oh...\n" .string "You’ve deflated me...$" -MauvilleCity_PokemonCenter_1F_Text_1B0998:: @ 81B0998 +gTextGiddy_AlsoIWasThinking:: @ 81B0998 .string "Also, I was thinking...$" -MauvilleCity_PokemonCenter_1F_Text_1B09B0:: @ 81B09B0 +gTextGiddy_ByeBye:: @ 81B09B0 .string "That’s about it, I think...\p" .string "We should chat again!\n" .string "Bye-bye!$" -- cgit v1.2.3 From b6ea4d9a77cdb6b416d3dd94eef68ce8a56cd4eb Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 24 Aug 2017 21:18:07 -0500 Subject: label more stuff in mauville_old_man.c --- data/scripts/mauville_man.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 239c360dc..159d729f6 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -322,4 +322,4 @@ bye_bye: end .include "data/text/bard.inc" - .include "data/text/hipster.inc" \ No newline at end of file + .include "data/text/hipster.inc" -- cgit v1.2.3 From b4f9fe17d766c5713875701c3ed8b2a0a6af8ce8 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 25 Aug 2017 20:55:08 +0200 Subject: move evo graphics data to C --- data/evolution_graphics.s | 70 ----------------------------------------------- 1 file changed, 70 deletions(-) delete mode 100644 data/evolution_graphics.s (limited to 'data') diff --git a/data/evolution_graphics.s b/data/evolution_graphics.s deleted file mode 100644 index e362b4dba..000000000 --- a/data/evolution_graphics.s +++ /dev/null @@ -1,70 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gEvoSparklePalette: @ 8416E44 - .incbin "graphics/misc/evo_sparkle.gbapal" - - .align 2 -gEvoSparkleTiles: @ 8416E64 - .incbin "graphics/misc/evo_sparkle.4bpp.lz" - -gUnknown_08416E84:: @ 8416E84 - obj_tiles gEvoSparkleTiles, 0x20, 1001 - .space 8 - -gUnknown_08416E94:: @ 8416E94 - obj_pal gEvoSparklePalette, 1001 - .space 8 - - .align 2 -gOamData_8416EA4:: @ 8416EA4 - .2byte 0x00A0 - .2byte 0x0000 - .2byte 0x0400 - - .align 2 -gSpriteAnim_8416EAC:: @ 8416EAC - obj_image_anim_frame 0, 8 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_8416EB4:: @ 8416EB4 - .4byte gSpriteAnim_8416EAC - - .align 2 -gSpriteTemplate_8416EB8:: @ 8416EB8 - spr_template 1001, 1001, gOamData_8416EA4, gSpriteAnimTable_8416EB4, NULL, gDummySpriteAffineAnimTable, nullsub_84 - - .align 1 -gUnknown_08416ED0:: @ 8416ED0 - .2byte 0x3C0 - .2byte 0x380 - .2byte 0x340 - .2byte 0x300 - .2byte 0x2C0 - .2byte 0x280 - .2byte 0x240 - .2byte 0x200 - .2byte 0x1C0 - .2byte 0x180 - .2byte 0x140 - .2byte 0x100 - .2byte 0xFFFC - .2byte 0x10 - .2byte 0xFFFD - .2byte 0x30 - .2byte 0xFFFE - .2byte 0x50 - .2byte 0xFFFF - .2byte 0x70 - .2byte 0x1 - .2byte 0x70 - .2byte 0x2 - .2byte 0x50 - .2byte 0x3 - .2byte 0x30 - .2byte 0x4 - .2byte 0x10 -- cgit v1.2.3 From e9037c7861b70d39686608b3eace9e9443c18c44 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 25 Aug 2017 23:38:46 -0400 Subject: move data to C --- data/shop.s | 69 ------------------------------------------------------------- 1 file changed, 69 deletions(-) delete mode 100644 data/shop.s (limited to 'data') diff --git a/data/shop.s b/data/shop.s deleted file mode 100644 index 071874d0e..000000000 --- a/data/shop.s +++ /dev/null @@ -1,69 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_083CC6D0:: @ 83CC6D0 - .4byte MartText_Buy, sub_80B2EFC - .4byte MartText_Sell, sub_80B2F30 - .4byte MartText_Quit2, HandleShopMenuQuit - -gUnknown_083CC6E8:: @ 83CC6E8 - .byte 0, 1, 2 - -gUnknown_083CC6EB:: @ 83CC6EB - .byte 0, 2 - -@ unknown, unreferenced data - .align 1 - .2byte 0x2 - .2byte 0x3 - .2byte 0x4 - .2byte 0xD - .2byte 0x121 - .2byte 0xE - .2byte 0xE - .2byte 0xE - .2byte 0xE - .2byte 0xE - .2byte 0xE - .2byte 0x0 - .2byte 0x0 - - .align 2 -gUnknown_083CC708:: @ 83CC708 - .4byte sub_80B3BF4 - .4byte sub_80B3D7C - - .align 1 -gUnknown_083CC710:: @ 83CC710 - .2byte 0x41EE,0x7FFF - - .align 1 -gUnknown_083CC714:: @ 83CC714 - .2byte 0x284,0x282,0x280 - - .align 1 -gUnknown_083CC71A:: @ 83CC71A - .2byte 0x285,0x283,0x281 - - .align 1 -gUnknown_083CC720:: @ 83CC720 - .2byte 0x28C,0x28A,0x288 - - .align 1 -gUnknown_083CC726:: @ 83CC726 - .2byte 0x28D,0x28B,0x289 - - .align 1 -gUnknown_083CC72C:: @ 83CC72C - .2byte 0x2A0,0x2A2,0x2A4 - - .align 1 -gUnknown_083CC732:: @ 83CC732 - .2byte 0x2A1,0x2A3,0x2A5 - - .align 1 -gUnknown_083CC738:: @ 83CC738 - .2byte 0x2A8,0x2AA,0x2AC -- cgit v1.2.3 From 991cbbffbcdbba6ba71ea9a08a7a28a29377f976 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 26 Aug 2017 19:45:45 -0500 Subject: import DizzyEggg's battle controller changes --- data/battle_811DA74.s | 64 ----------------------- data/battle_anim_81258BC.s | 64 ----------------------- data/battle_anim_8137220.s | 64 ----------------------- data/data2b.s | 126 --------------------------------------------- data/data2c.s | 10 ++++ 5 files changed, 10 insertions(+), 318 deletions(-) delete mode 100644 data/battle_811DA74.s delete mode 100644 data/battle_anim_81258BC.s delete mode 100644 data/battle_anim_8137220.s create mode 100644 data/data2c.s (limited to 'data') diff --git a/data/battle_811DA74.s b/data/battle_811DA74.s deleted file mode 100644 index 873c76eb9..000000000 --- a/data/battle_811DA74.s +++ /dev/null @@ -1,64 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gLinkPartnerBufferCommands:: @ 83FE4F4 - .4byte LinkPartnerHandleGetAttributes - .4byte sub_811EC04 - .4byte LinkPartnerHandleSetAttributes - .4byte sub_811F664 - .4byte sub_811F6D8 - .4byte sub_811F7F4 - .4byte sub_811F9D0 - .4byte sub_811FAE4 - .4byte sub_811FC30 - .4byte sub_811FC3C - .4byte sub_811FCE8 - .4byte sub_811FDCC - .4byte sub_811FDD8 - .4byte sub_811FDE4 - .4byte sub_811FDF0 - .4byte sub_811FDFC - .4byte sub_8120094 - .4byte sub_81200F8 - .4byte sub_8120104 - .4byte sub_8120110 - .4byte sub_812011C - .4byte sub_8120128 - .4byte sub_8120134 - .4byte sub_8120140 - .4byte LinkPartnerHandleHealthBarUpdate - .4byte LinkPartnerHandleExpBarUpdate - .4byte LinkPartnerHandleStatusIconUpdate - .4byte LinkPartnerHandleStatusAnimation - .4byte sub_8120324 - .4byte sub_8120330 - .4byte sub_812033C - .4byte sub_8120348 - .4byte sub_8120354 - .4byte sub_8120360 - .4byte sub_812036C - .4byte sub_8120378 - .4byte sub_8120384 - .4byte sub_8120390 - .4byte sub_81203AC - .4byte sub_81203E4 - .4byte sub_81203FC - .4byte LinkPartnerHandleHitAnimation - .4byte sub_8120494 - .4byte LinkPartnerHandleEffectivenessSound - .4byte sub_81204E4 - .4byte LinkPartnerHandleFaintingCry - .4byte dp01t_2E_3_battle_intro - .4byte sub_8120588 - .4byte dp01t_30_3_80EB11C - .4byte sub_8120920 - .4byte sub_812096C - .4byte sub_8120978 - .4byte sub_81209D8 - .4byte sub_8120A40 - .4byte sub_8120A4C - .4byte sub_8120A58 - .4byte nullsub_75 diff --git a/data/battle_anim_81258BC.s b/data/battle_anim_81258BC.s deleted file mode 100644 index 993adbc2e..000000000 --- a/data/battle_anim_81258BC.s +++ /dev/null @@ -1,64 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gSafariBufferCommands:: @ 8402080 - .4byte SafariHandleGetAttributes - .4byte sub_812B870 - .4byte sub_812B87C - .4byte sub_812B888 - .4byte sub_812B894 - .4byte sub_812B8A0 - .4byte sub_812B8AC - .4byte sub_812B8B8 - .4byte sub_812B994 - .4byte sub_812B9A0 - .4byte sub_812B9AC - .4byte sub_812B9B8 - .4byte sub_812B9C4 - .4byte sub_812BA14 - .4byte sub_812BA70 - .4byte sub_812BA7C - .4byte SafariHandlePrintString - .4byte SafariHandlePrintStringPlayerOnly - .4byte sub_812BB10 - .4byte sub_812BBFC - .4byte sub_812BC08 - .4byte sub_812BC14 - .4byte sub_812BC54 - .4byte sub_812BC60 - .4byte sub_812BC6C - .4byte sub_812BC78 - .4byte sub_812BC84 - .4byte sub_812BCC0 - .4byte sub_812BCCC - .4byte sub_812BCD8 - .4byte sub_812BCE4 - .4byte sub_812BCF0 - .4byte sub_812BCFC - .4byte sub_812BD08 - .4byte sub_812BD14 - .4byte sub_812BD20 - .4byte sub_812BD2C - .4byte sub_812BD38 - .4byte sub_812BD44 - .4byte sub_812BD50 - .4byte sub_812BD5C - .4byte sub_812BD68 - .4byte sub_812BD74 - .4byte sub_812BD80 - .4byte sub_812BDC4 - .4byte sub_812BDF4 - .4byte dp01t_2E_6_battle_intro - .4byte sub_812BE64 - .4byte sub_812BEB0 - .4byte sub_812BEBC - .4byte sub_812BEC8 - .4byte sub_812BED4 - .4byte sub_812BEE0 - .4byte sub_812BF3C - .4byte sub_812BF48 - .4byte sub_812BF54 - .4byte nullsub_78 diff --git a/data/battle_anim_8137220.s b/data/battle_anim_8137220.s deleted file mode 100644 index c1673af9a..000000000 --- a/data/battle_anim_8137220.s +++ /dev/null @@ -1,64 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gWallyBufferCommands:: @ 84061A4 - .4byte dp01t_00_5_getattr - .4byte sub_8138230 - .4byte sub_813823C - .4byte sub_8138C90 - .4byte sub_8138C9C - .4byte sub_8138CA8 - .4byte sub_8138CB4 - .4byte sub_8138D38 - .4byte sub_8138E04 - .4byte sub_8138ED0 - .4byte sub_8138EDC - .4byte sub_8138EE8 - .4byte sub_8138EF4 - .4byte sub_8138F44 - .4byte sub_8138FA0 - .4byte sub_8138FAC - .4byte sub_8139208 - .4byte dp01t_11_5_message_for_player_only - .4byte sub_8139298 - .4byte sub_8139378 - .4byte sub_8139384 - .4byte sub_81393EC - .4byte sub_813942C - .4byte sub_8139438 - .4byte sub_8139444 - .4byte sub_8139544 - .4byte sub_8139550 - .4byte sub_813955C - .4byte sub_8139568 - .4byte sub_8139574 - .4byte sub_8139580 - .4byte sub_813958C - .4byte sub_8139598 - .4byte sub_81395A4 - .4byte sub_81395B0 - .4byte sub_81395BC - .4byte sub_81395C8 - .4byte sub_81395D4 - .4byte sub_81395E0 - .4byte sub_81395EC - .4byte sub_81395F8 - .4byte sub_8139604 - .4byte sub_8139674 - .4byte sub_8139680 - .4byte sub_81396B0 - .4byte sub_81396E0 - .4byte dp01t_2E_5_battle_intro - .4byte sub_8139750 - .4byte sub_8139AA0 - .4byte sub_8139B20 - .4byte sub_8139B2C - .4byte sub_8139B38 - .4byte sub_8139B44 - .4byte sub_8139BA0 - .4byte sub_8139BAC - .4byte sub_8139BB8 - .4byte nullsub_80 diff --git a/data/data2b.s b/data/data2b.s index 0387b6699..329384396 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -76,129 +76,3 @@ gUnknown_081FAF4C:: @ 81FAF4C .4byte 0x0200a000 .4byte 0x0200c000 .4byte 0x0200e000 - - .align 2 -gOpponentBufferCommands:: @ 81FAF5C - .4byte OpponentHandleGetAttributes - .4byte dp01t_01_2_read_pokmon_data_slice - .4byte OpponentHandleSetAttributes - .4byte sub_8034744 - .4byte OpponentHandleLoadPokeSprite - .4byte OpponentHandleSendOutPoke - .4byte OpponentHandleReturnPokeToBall - .4byte OpponentHandleTrainerThrow - .4byte OpponentHandleTrainerSlide - .4byte OpponentHandleTrainerSlideBack - .4byte sub_8035030 - .4byte sub_80350D4 - .4byte sub_80350E0 - .4byte OpponentHandleBallThrow - .4byte OpponentHandlePause - .4byte OpponentHandleMoveAnimation - .4byte OpponentHandlePrintString - .4byte OpponentHandlePrintStringPlayerOnly - .4byte sub_803540C - .4byte sub_803541C - .4byte sub_8035428 - .4byte sub_8035590 - .4byte sub_80355C0 - .4byte sub_80356C0 - .4byte OpponentHandleHealthBarUpdate - .4byte OpponentHandleExpBarUpdate - .4byte OpponentHandleStatusIconUpdate - .4byte OpponentHandleStatusAnimation - .4byte OpponentHandleStatusXor - .4byte sub_80358B0 - .4byte OpponentHandleDMATransfer - .4byte sub_80358C8 - .4byte sub_80358D4 - .4byte sub_80358E0 - .4byte sub_80358EC - .4byte sub_80358F8 - .4byte sub_8035904 - .4byte sub_8035910 - .4byte sub_803592C - .4byte sub_8035964 - .4byte sub_803597C - .4byte OpponentHandleHitAnimation - .4byte sub_8035A14 - .4byte OpponentHandleEffectivenessSound - .4byte sub_8035A64 - .4byte OpponentHandleFaintingCry - .4byte dp01t_2E_7_battle_intro - .4byte sub_8035B04 - .4byte dp01t_30_7_0803D67C - .4byte sub_8035E6C - .4byte sub_8035EB8 - .4byte OpponentHandleSpriteInvisibility - .4byte OpponentHandleBattleAnimation - .4byte OpponentHandleLinkStandbyMsg - .4byte OpponentHandleResetActionMoveSelection - .4byte sub_8035FA4 - .4byte nullsub_46 - -@ unreferenced unknown values - .byte 0xB0, 0xB0, 0xC8, 0x98, 0x28, 0x28, 0x28, 0x20 - - .align 2 -gLinkOpponentBufferCommands:: @ 81FB048 - .4byte LinkOpponentHandleGetAttributes - .4byte sub_803889C - .4byte sub_80388A8 - .4byte sub_8039220 - .4byte sub_8039294 - .4byte sub_80393E4 - .4byte sub_80395B4 - .4byte sub_80396D0 - .4byte sub_80398A4 - .4byte sub_80398B0 - .4byte sub_803995C - .4byte sub_8039A00 - .4byte sub_8039A0C - .4byte sub_8039A18 - .4byte sub_8039A24 - .4byte sub_8039A30 - .4byte sub_8039CC8 - .4byte sub_8039D2C - .4byte sub_8039D38 - .4byte sub_8039D44 - .4byte sub_8039D50 - .4byte sub_8039D5C - .4byte sub_8039D68 - .4byte sub_8039D74 - .4byte sub_8039D80 - .4byte sub_8039E70 - .4byte sub_8039E7C - .4byte sub_8039EF0 - .4byte sub_8039F58 - .4byte sub_8039F64 - .4byte sub_8039F70 - .4byte sub_8039F7C - .4byte sub_8039F88 - .4byte sub_8039F94 - .4byte sub_8039FA0 - .4byte sub_8039FAC - .4byte sub_8039FB8 - .4byte sub_8039FC4 - .4byte sub_8039FE0 - .4byte sub_803A018 - .4byte sub_803A030 - .4byte dp01t_29_4_blink - .4byte sub_803A0C8 - .4byte sub_803A0D4 - .4byte sub_803A118 - .4byte sub_803A148 - .4byte dp01t_2E_4_battle_intro - .4byte sub_803A1B8 - .4byte sub_803A3DC - .4byte sub_803A520 - .4byte sub_803A56C - .4byte sub_803A578 - .4byte bx_exec_buffer_A_ch0_tbl4 - .4byte sub_803A640 - .4byte sub_803A64C - .4byte sub_803A658 - .4byte nullsub_48 - -@ 81FB12C - .include "data/battle_moves.inc" diff --git a/data/data2c.s b/data/data2c.s new file mode 100644 index 000000000..260b451cf --- /dev/null +++ b/data/data2c.s @@ -0,0 +1,10 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + + +@ 81FB12C + .include "data/battle_moves.inc" + -- cgit v1.2.3 From 77ae82fc51c8c84e338b15e801f0a98dd5cbe1ef Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 27 Aug 2017 14:15:39 +0200 Subject: move data to C --- data/evolution_scene.s | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 data/evolution_scene.s (limited to 'data') diff --git a/data/evolution_scene.s b/data/evolution_scene.s deleted file mode 100644 index 24744a196..000000000 --- a/data/evolution_scene.s +++ /dev/null @@ -1,14 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_083F868C:: @ 83F868C - .string "ヌケニン$" - - .string "{COLOR DARK_GREY}{HIGHLIGHT WHITE2}{SHADOW LIGHT_GREY}$" - .string "▶\n $" - .string " \n▶$" - .string " \n $" - - .space 9 -- cgit v1.2.3 From 9202e8d4c0b8ae285d0dae4ead2582c04c5d100f Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 27 Aug 2017 11:13:32 -0500 Subject: data2c.s -> battle_moves.s --- data/battle_moves.inc | 3906 ------------------------------------------------ data/battle_moves.s | 3911 +++++++++++++++++++++++++++++++++++++++++++++++++ data/data2c.s | 10 - 3 files changed, 3911 insertions(+), 3916 deletions(-) delete mode 100644 data/battle_moves.inc create mode 100644 data/battle_moves.s delete mode 100644 data/data2c.s (limited to 'data') diff --git a/data/battle_moves.inc b/data/battle_moves.inc deleted file mode 100644 index ff7e2cb33..000000000 --- a/data/battle_moves.inc +++ /dev/null @@ -1,3906 +0,0 @@ - .align 2 -gBattleMoves:: @ 81FB12C -@ NONE - .byte EFFECT_HIT - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 0 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ POUND - .byte EFFECT_HIT - .byte 40 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 35 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ KARATE_CHOP - .byte EFFECT_HIGH_CRITICAL - .byte 50 @ power - .byte TYPE_FIGHTING - .byte 100 @ accuracy - .byte 25 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ DOUBLE_SLAP - .byte EFFECT_MULTI_HIT - .byte 15 @ power - .byte TYPE_NORMAL - .byte 85 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ COMET_PUNCH - .byte EFFECT_MULTI_HIT - .byte 18 @ power - .byte TYPE_NORMAL - .byte 85 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ MEGA_PUNCH - .byte EFFECT_HIT - .byte 80 @ power - .byte TYPE_NORMAL - .byte 85 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ PAY_DAY - .byte EFFECT_PAY_DAY - .byte 40 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 20 @ PP - .byte 100 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ FIRE_PUNCH - .byte EFFECT_BURN_HIT - .byte 75 @ power - .byte TYPE_FIRE - .byte 100 @ accuracy - .byte 15 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ ICE_PUNCH - .byte EFFECT_FREEZE_HIT - .byte 75 @ power - .byte TYPE_ICE - .byte 100 @ accuracy - .byte 15 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ THUNDER_PUNCH - .byte EFFECT_PARALYZE_HIT - .byte 75 @ power - .byte TYPE_ELECTRIC - .byte 100 @ accuracy - .byte 15 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SCRATCH - .byte EFFECT_HIT - .byte 40 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 35 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ VICE_GRIP - .byte EFFECT_HIT - .byte 55 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ GUILLOTINE - .byte EFFECT_OHKO - .byte 1 @ power - .byte TYPE_NORMAL - .byte 30 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ RAZOR_WIND - .byte EFFECT_RAZOR_WIND - .byte 80 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SWORDS_DANCE - .byte EFFECT_ATTACK_UP_2 - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ CUT - .byte EFFECT_HIT - .byte 50 @ power - .byte TYPE_NORMAL - .byte 95 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ GUST - .byte EFFECT_GUST - .byte 40 @ power - .byte TYPE_FLYING - .byte 100 @ accuracy - .byte 35 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ WING_ATTACK - .byte EFFECT_HIT - .byte 60 @ power - .byte TYPE_FLYING - .byte 100 @ accuracy - .byte 35 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ WHIRLWIND - .byte EFFECT_ROAR - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte -6 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ FLY - .byte EFFECT_FLY - .byte 70 @ power - .byte TYPE_FLYING - .byte 95 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ BIND - .byte EFFECT_TRAP - .byte 15 @ power - .byte TYPE_NORMAL - .byte 75 @ accuracy - .byte 20 @ PP - .byte 100 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SLAM - .byte EFFECT_HIT - .byte 80 @ power - .byte TYPE_NORMAL - .byte 75 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ VINE_WHIP - .byte EFFECT_HIT - .byte 35 @ power - .byte TYPE_GRASS - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ STOMP - .byte EFFECT_FLINCH_HIT_2 - .byte 65 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 20 @ PP - .byte 30 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ DOUBLE_KICK - .byte EFFECT_DOUBLE_HIT - .byte 30 @ power - .byte TYPE_FIGHTING - .byte 100 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ MEGA_KICK - .byte EFFECT_HIT - .byte 120 @ power - .byte TYPE_NORMAL - .byte 75 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ JUMP_KICK - .byte EFFECT_RECOIL_IF_MISS - .byte 70 @ power - .byte TYPE_FIGHTING - .byte 95 @ accuracy - .byte 25 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ ROLLING_KICK - .byte EFFECT_FLINCH_HIT - .byte 60 @ power - .byte TYPE_FIGHTING - .byte 85 @ accuracy - .byte 15 @ PP - .byte 30 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SAND_ATTACK - .byte EFFECT_ACCURACY_DOWN - .byte 0 @ power - .byte TYPE_GROUND - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ HEADBUTT - .byte EFFECT_FLINCH_HIT - .byte 70 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 15 @ PP - .byte 30 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ HORN_ATTACK - .byte EFFECT_HIT - .byte 65 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 25 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ FURY_ATTACK - .byte EFFECT_MULTI_HIT - .byte 15 @ power - .byte TYPE_NORMAL - .byte 85 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ HORN_DRILL - .byte EFFECT_OHKO - .byte 1 @ power - .byte TYPE_NORMAL - .byte 30 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ TACKLE - .byte EFFECT_HIT - .byte 35 @ power - .byte TYPE_NORMAL - .byte 95 @ accuracy - .byte 35 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ BODY_SLAM - .byte EFFECT_PARALYZE_HIT - .byte 85 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 15 @ PP - .byte 30 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ WRAP - .byte EFFECT_TRAP - .byte 15 @ power - .byte TYPE_NORMAL - .byte 85 @ accuracy - .byte 20 @ PP - .byte 100 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ TAKE_DOWN - .byte EFFECT_RECOIL - .byte 90 @ power - .byte TYPE_NORMAL - .byte 85 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ THRASH - .byte EFFECT_RAMPAGE - .byte 90 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 20 @ PP - .byte 100 @ secondary effect chance - .byte F_TARGET_RANDOM - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ DOUBLE_EDGE - .byte EFFECT_DOUBLE_EDGE - .byte 120 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ TAIL_WHIP - .byte EFFECT_DEFENSE_DOWN - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ POISON_STING - .byte EFFECT_POISON_HIT - .byte 15 @ power - .byte TYPE_POISON - .byte 100 @ accuracy - .byte 35 @ PP - .byte 30 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ TWINEEDLE - .byte EFFECT_TWINEEDLE - .byte 25 @ power - .byte TYPE_BUG - .byte 100 @ accuracy - .byte 20 @ PP - .byte 20 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ PIN_MISSILE - .byte EFFECT_MULTI_HIT - .byte 14 @ power - .byte TYPE_BUG - .byte 85 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ LEER - .byte EFFECT_DEFENSE_DOWN - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ BITE - .byte EFFECT_FLINCH_HIT - .byte 60 @ power - .byte TYPE_DARK - .byte 100 @ accuracy - .byte 25 @ PP - .byte 30 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ GROWL - .byte EFFECT_ATTACK_DOWN - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 40 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ ROAR - .byte EFFECT_ROAR - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte -6 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SING - .byte EFFECT_SLEEP - .byte 0 @ power - .byte TYPE_NORMAL - .byte 55 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SUPERSONIC - .byte EFFECT_CONFUSE - .byte 0 @ power - .byte TYPE_NORMAL - .byte 55 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SONIC_BOOM - .byte EFFECT_SONICBOOM - .byte 1 @ power - .byte TYPE_NORMAL - .byte 90 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ DISABLE - .byte EFFECT_DISABLE - .byte 0 @ power - .byte TYPE_NORMAL - .byte 55 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ ACID - .byte EFFECT_DEFENSE_DOWN_HIT - .byte 40 @ power - .byte TYPE_POISON - .byte 100 @ accuracy - .byte 30 @ PP - .byte 10 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ EMBER - .byte EFFECT_BURN_HIT - .byte 40 @ power - .byte TYPE_FIRE - .byte 100 @ accuracy - .byte 25 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ FLAMETHROWER - .byte EFFECT_BURN_HIT - .byte 95 @ power - .byte TYPE_FIRE - .byte 100 @ accuracy - .byte 15 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ MIST - .byte EFFECT_MIST - .byte 0 @ power - .byte TYPE_ICE - .byte 0 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ WATER_GUN - .byte EFFECT_HIT - .byte 40 @ power - .byte TYPE_WATER - .byte 100 @ accuracy - .byte 25 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ HYDRO_PUMP - .byte EFFECT_HIT - .byte 120 @ power - .byte TYPE_WATER - .byte 80 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SURF - .byte EFFECT_HIT - .byte 95 @ power - .byte TYPE_WATER - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ ICE_BEAM - .byte EFFECT_FREEZE_HIT - .byte 95 @ power - .byte TYPE_ICE - .byte 100 @ accuracy - .byte 10 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ BLIZZARD - .byte EFFECT_FREEZE_HIT - .byte 120 @ power - .byte TYPE_ICE - .byte 70 @ accuracy - .byte 5 @ PP - .byte 10 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ PSYBEAM - .byte EFFECT_CONFUSE_HIT - .byte 65 @ power - .byte TYPE_PSYCHIC - .byte 100 @ accuracy - .byte 20 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ BUBBLE_BEAM - .byte EFFECT_SPEED_DOWN_HIT - .byte 65 @ power - .byte TYPE_WATER - .byte 100 @ accuracy - .byte 20 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ AURORA_BEAM - .byte EFFECT_ATTACK_DOWN_HIT - .byte 65 @ power - .byte TYPE_ICE - .byte 100 @ accuracy - .byte 20 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ HYPER_BEAM - .byte EFFECT_RECHARGE - .byte 150 @ power - .byte TYPE_NORMAL - .byte 90 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ PECK - .byte EFFECT_HIT - .byte 35 @ power - .byte TYPE_FLYING - .byte 100 @ accuracy - .byte 35 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ DRILL_PECK - .byte EFFECT_HIT - .byte 80 @ power - .byte TYPE_FLYING - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SUBMISSION - .byte EFFECT_RECOIL - .byte 80 @ power - .byte TYPE_FIGHTING - .byte 80 @ accuracy - .byte 25 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ LOW_KICK - .byte EFFECT_LOW_KICK - .byte 1 @ power - .byte TYPE_FIGHTING - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ COUNTER - .byte EFFECT_COUNTER - .byte 1 @ power - .byte TYPE_FIGHTING - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL - .byte -5 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_MAKES_CONTACT @ misc. flags - -@ SEISMIC_TOSS - .byte EFFECT_LEVEL_DAMAGE - .byte 1 @ power - .byte TYPE_FIGHTING - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ STRENGTH - .byte EFFECT_HIT - .byte 80 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ ABSORB - .byte EFFECT_ABSORB - .byte 20 @ power - .byte TYPE_GRASS - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ MEGA_DRAIN - .byte EFFECT_ABSORB - .byte 40 @ power - .byte TYPE_GRASS - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ LEECH_SEED - .byte EFFECT_LEECH_SEED - .byte 0 @ power - .byte TYPE_GRASS - .byte 90 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ GROWTH - .byte EFFECT_SPECIAL_ATTACK_UP - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 40 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ RAZOR_LEAF - .byte EFFECT_HIGH_CRITICAL - .byte 55 @ power - .byte TYPE_GRASS - .byte 95 @ accuracy - .byte 25 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SOLAR_BEAM - .byte EFFECT_SOLARBEAM - .byte 120 @ power - .byte TYPE_GRASS - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ POISON_POWDER - .byte EFFECT_POISON - .byte 0 @ power - .byte TYPE_POISON - .byte 75 @ accuracy - .byte 35 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ STUN_SPORE - .byte EFFECT_PARALYZE - .byte 0 @ power - .byte TYPE_GRASS - .byte 75 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SLEEP_POWDER - .byte EFFECT_SLEEP - .byte 0 @ power - .byte TYPE_GRASS - .byte 75 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ PETAL_DANCE - .byte EFFECT_RAMPAGE - .byte 70 @ power - .byte TYPE_GRASS - .byte 100 @ accuracy - .byte 20 @ PP - .byte 100 @ secondary effect chance - .byte F_TARGET_RANDOM - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ STRING_SHOT - .byte EFFECT_SPEED_DOWN - .byte 0 @ power - .byte TYPE_BUG - .byte 95 @ accuracy - .byte 40 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ DRAGON_RAGE - .byte EFFECT_DRAGON_RAGE - .byte 1 @ power - .byte TYPE_DRAGON - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ FIRE_SPIN - .byte EFFECT_TRAP - .byte 15 @ power - .byte TYPE_FIRE - .byte 70 @ accuracy - .byte 15 @ PP - .byte 100 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ THUNDER_SHOCK - .byte EFFECT_PARALYZE_HIT - .byte 40 @ power - .byte TYPE_ELECTRIC - .byte 100 @ accuracy - .byte 30 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ THUNDERBOLT - .byte EFFECT_PARALYZE_HIT - .byte 95 @ power - .byte TYPE_ELECTRIC - .byte 100 @ accuracy - .byte 15 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ THUNDER_WAVE - .byte EFFECT_PARALYZE - .byte 0 @ power - .byte TYPE_ELECTRIC - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ THUNDER - .byte EFFECT_THUNDER - .byte 120 @ power - .byte TYPE_ELECTRIC - .byte 70 @ accuracy - .byte 10 @ PP - .byte 30 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ ROCK_THROW - .byte EFFECT_HIT - .byte 50 @ power - .byte TYPE_ROCK - .byte 90 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ EARTHQUAKE - .byte EFFECT_EARTHQUAKE - .byte 100 @ power - .byte TYPE_GROUND - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_ALL_EXCEPT_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ FISSURE - .byte EFFECT_OHKO - .byte 1 @ power - .byte TYPE_GROUND - .byte 30 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ DIG - .byte EFFECT_FLY - .byte 60 @ power - .byte TYPE_GROUND - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ TOXIC - .byte EFFECT_TOXIC - .byte 0 @ power - .byte TYPE_POISON - .byte 85 @ accuracy - .byte 10 @ PP - .byte 100 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ CONFUSION - .byte EFFECT_CONFUSE_HIT - .byte 50 @ power - .byte TYPE_PSYCHIC - .byte 100 @ accuracy - .byte 25 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ PSYCHIC - .byte EFFECT_SPECIAL_DEFENSE_DOWN_HIT - .byte 90 @ power - .byte TYPE_PSYCHIC - .byte 100 @ accuracy - .byte 10 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ HYPNOSIS - .byte EFFECT_SLEEP - .byte 0 @ power - .byte TYPE_PSYCHIC - .byte 60 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ MEDITATE - .byte EFFECT_ATTACK_UP - .byte 0 @ power - .byte TYPE_PSYCHIC - .byte 0 @ accuracy - .byte 40 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ AGILITY - .byte EFFECT_SPEED_UP_2 - .byte 0 @ power - .byte TYPE_PSYCHIC - .byte 0 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ QUICK_ATTACK - .byte EFFECT_QUICK_ATTACK - .byte 40 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 1 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ RAGE - .byte EFFECT_RAGE - .byte 20 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ TELEPORT - .byte EFFECT_TELEPORT - .byte 0 @ power - .byte TYPE_PSYCHIC - .byte 0 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ NIGHT_SHADE - .byte EFFECT_LEVEL_DAMAGE - .byte 1 @ power - .byte TYPE_GHOST - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ MIMIC - .byte EFFECT_MIMIC - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_PROTECT @ misc. flags - -@ SCREECH - .byte EFFECT_DEFENSE_DOWN_2 - .byte 0 @ power - .byte TYPE_NORMAL - .byte 85 @ accuracy - .byte 40 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ DOUBLE_TEAM - .byte EFFECT_EVASION_UP - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ RECOVER - .byte EFFECT_RESTORE_HP - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ HARDEN - .byte EFFECT_DEFENSE_UP - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ MINIMIZE - .byte EFFECT_MINIMIZE - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ SMOKESCREEN - .byte EFFECT_ACCURACY_DOWN - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ CONFUSE_RAY - .byte EFFECT_CONFUSE - .byte 0 @ power - .byte TYPE_GHOST - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ WITHDRAW - .byte EFFECT_DEFENSE_UP - .byte 0 @ power - .byte TYPE_WATER - .byte 0 @ accuracy - .byte 40 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ DEFENSE_CURL - .byte EFFECT_DEFENSE_CURL - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 40 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ BARRIER - .byte EFFECT_DEFENSE_UP_2 - .byte 0 @ power - .byte TYPE_PSYCHIC - .byte 0 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ LIGHT_SCREEN - .byte EFFECT_LIGHT_SCREEN - .byte 0 @ power - .byte TYPE_PSYCHIC - .byte 0 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ HAZE - .byte EFFECT_HAZE - .byte 0 @ power - .byte TYPE_ICE - .byte 0 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_PROTECT @ misc. flags - -@ REFLECT - .byte EFFECT_REFLECT - .byte 0 @ power - .byte TYPE_PSYCHIC - .byte 0 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ FOCUS_ENERGY - .byte EFFECT_FOCUS_ENERGY - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ BIDE - .byte EFFECT_BIDE - .byte 1 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ METRONOME - .byte EFFECT_METRONOME - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ MIRROR_MOVE - .byte EFFECT_MIRROR_MOVE - .byte 0 @ power - .byte TYPE_FLYING - .byte 0 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ SELF_DESTRUCT - .byte EFFECT_EXPLOSION - .byte 200 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_ALL_EXCEPT_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ EGG_BOMB - .byte EFFECT_HIT - .byte 100 @ power - .byte TYPE_NORMAL - .byte 75 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ LICK - .byte EFFECT_PARALYZE_HIT - .byte 20 @ power - .byte TYPE_GHOST - .byte 100 @ accuracy - .byte 30 @ PP - .byte 30 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SMOG - .byte EFFECT_POISON_HIT - .byte 20 @ power - .byte TYPE_POISON - .byte 70 @ accuracy - .byte 20 @ PP - .byte 40 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SLUDGE - .byte EFFECT_POISON_HIT - .byte 65 @ power - .byte TYPE_POISON - .byte 100 @ accuracy - .byte 20 @ PP - .byte 30 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ BONE_CLUB - .byte EFFECT_FLINCH_HIT - .byte 65 @ power - .byte TYPE_GROUND - .byte 85 @ accuracy - .byte 20 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ FIRE_BLAST - .byte EFFECT_BURN_HIT - .byte 120 @ power - .byte TYPE_FIRE - .byte 85 @ accuracy - .byte 5 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ WATERFALL - .byte EFFECT_HIT - .byte 80 @ power - .byte TYPE_WATER - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ CLAMP - .byte EFFECT_TRAP - .byte 35 @ power - .byte TYPE_WATER - .byte 75 @ accuracy - .byte 10 @ PP - .byte 100 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SWIFT - .byte EFFECT_ALWAYS_HIT - .byte 60 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SKULL_BASH - .byte EFFECT_SKULL_BASH - .byte 100 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SPIKE_CANNON - .byte EFFECT_MULTI_HIT - .byte 20 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ CONSTRICT - .byte EFFECT_SPEED_DOWN_HIT - .byte 10 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 35 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ AMNESIA - .byte EFFECT_SPECIAL_DEFENSE_UP_2 - .byte 0 @ power - .byte TYPE_PSYCHIC - .byte 0 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ KINESIS - .byte EFFECT_ACCURACY_DOWN - .byte 0 @ power - .byte TYPE_PSYCHIC - .byte 80 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SOFT_BOILED - .byte EFFECT_SOFTBOILED - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_SNATCH @ misc. flags - -@ HI_JUMP_KICK - .byte EFFECT_RECOIL_IF_MISS - .byte 85 @ power - .byte TYPE_FIGHTING - .byte 90 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ GLARE - .byte EFFECT_PARALYZE - .byte 0 @ power - .byte TYPE_NORMAL - .byte 75 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ DREAM_EATER - .byte EFFECT_DREAM_EATER - .byte 100 @ power - .byte TYPE_PSYCHIC - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ POISON_GAS - .byte EFFECT_POISON - .byte 0 @ power - .byte TYPE_POISON - .byte 55 @ accuracy - .byte 40 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ BARRAGE - .byte EFFECT_MULTI_HIT - .byte 15 @ power - .byte TYPE_NORMAL - .byte 85 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ LEECH_LIFE - .byte EFFECT_ABSORB - .byte 20 @ power - .byte TYPE_BUG - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ LOVELY_KISS - .byte EFFECT_SLEEP - .byte 0 @ power - .byte TYPE_NORMAL - .byte 75 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SKY_ATTACK - .byte EFFECT_SKY_ATTACK - .byte 140 @ power - .byte TYPE_FLYING - .byte 90 @ accuracy - .byte 5 @ PP - .byte 30 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ TRANSFORM - .byte EFFECT_TRANSFORM - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ BUBBLE - .byte EFFECT_SPEED_DOWN_HIT - .byte 20 @ power - .byte TYPE_WATER - .byte 100 @ accuracy - .byte 30 @ PP - .byte 10 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ DIZZY_PUNCH - .byte EFFECT_CONFUSE_HIT - .byte 70 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 10 @ PP - .byte 20 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SPORE - .byte EFFECT_SLEEP - .byte 0 @ power - .byte TYPE_GRASS - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ FLASH - .byte EFFECT_ACCURACY_DOWN - .byte 0 @ power - .byte TYPE_NORMAL - .byte 70 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ PSYWAVE - .byte EFFECT_PSYWAVE - .byte 1 @ power - .byte TYPE_PSYCHIC - .byte 80 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SPLASH - .byte EFFECT_SPLASH - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 40 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ ACID_ARMOR - .byte EFFECT_DEFENSE_UP_2 - .byte 0 @ power - .byte TYPE_POISON - .byte 0 @ accuracy - .byte 40 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ CRABHAMMER - .byte EFFECT_HIGH_CRITICAL - .byte 90 @ power - .byte TYPE_WATER - .byte 85 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ EXPLOSION - .byte EFFECT_EXPLOSION - .byte 250 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_ALL_EXCEPT_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ FURY_SWIPES - .byte EFFECT_MULTI_HIT - .byte 18 @ power - .byte TYPE_NORMAL - .byte 80 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ BONEMERANG - .byte EFFECT_DOUBLE_HIT - .byte 50 @ power - .byte TYPE_GROUND - .byte 90 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ REST - .byte EFFECT_REST - .byte 0 @ power - .byte TYPE_PSYCHIC - .byte 0 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ ROCK_SLIDE - .byte EFFECT_FLINCH_HIT - .byte 75 @ power - .byte TYPE_ROCK - .byte 90 @ accuracy - .byte 10 @ PP - .byte 30 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ HYPER_FANG - .byte EFFECT_FLINCH_HIT - .byte 80 @ power - .byte TYPE_NORMAL - .byte 90 @ accuracy - .byte 15 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SHARPEN - .byte EFFECT_ATTACK_UP - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ CONVERSION - .byte EFFECT_CONVERSION - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ TRI_ATTACK - .byte EFFECT_TRI_ATTACK - .byte 80 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 10 @ PP - .byte 20 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SUPER_FANG - .byte EFFECT_SUPER_FANG - .byte 1 @ power - .byte TYPE_NORMAL - .byte 90 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SLASH - .byte EFFECT_HIGH_CRITICAL - .byte 70 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SUBSTITUTE - .byte EFFECT_SUBSTITUTE - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ STRUGGLE - .byte EFFECT_RECOIL - .byte 50 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 1 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SKETCH - .byte EFFECT_SKETCH - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 1 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ TRIPLE_KICK - .byte EFFECT_TRIPLE_KICK - .byte 10 @ power - .byte TYPE_FIGHTING - .byte 90 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ THIEF - .byte EFFECT_THIEF - .byte 40 @ power - .byte TYPE_DARK - .byte 100 @ accuracy - .byte 10 @ PP - .byte 100 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SPIDER_WEB - .byte EFFECT_MEAN_LOOK - .byte 0 @ power - .byte TYPE_BUG - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ MIND_READER - .byte EFFECT_LOCK_ON - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ NIGHTMARE - .byte EFFECT_NIGHTMARE - .byte 0 @ power - .byte TYPE_GHOST - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ FLAME_WHEEL - .byte EFFECT_THAW_HIT - .byte 60 @ power - .byte TYPE_FIRE - .byte 100 @ accuracy - .byte 25 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SNORE - .byte EFFECT_SNORE - .byte 40 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 15 @ PP - .byte 30 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ CURSE - .byte EFFECT_CURSE - .byte 0 @ power - .byte TYPE_MYSTERY - .byte 0 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ FLAIL - .byte EFFECT_FLAIL - .byte 1 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ CONVERSION_2 - .byte EFFECT_CONVERSION_2 - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ AEROBLAST - .byte EFFECT_HIGH_CRITICAL - .byte 100 @ power - .byte TYPE_FLYING - .byte 95 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ COTTON_SPORE - .byte EFFECT_SPEED_DOWN_2 - .byte 0 @ power - .byte TYPE_GRASS - .byte 85 @ accuracy - .byte 40 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ REVERSAL - .byte EFFECT_FLAIL - .byte 1 @ power - .byte TYPE_FIGHTING - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SPITE - .byte EFFECT_SPITE - .byte 0 @ power - .byte TYPE_GHOST - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ POWDER_SNOW - .byte EFFECT_FREEZE_HIT - .byte 40 @ power - .byte TYPE_ICE - .byte 100 @ accuracy - .byte 25 @ PP - .byte 10 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ PROTECT - .byte EFFECT_PROTECT - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 3 @ priority - .4byte 0 @ misc. flags - -@ MACH_PUNCH - .byte EFFECT_QUICK_ATTACK - .byte 40 @ power - .byte TYPE_FIGHTING - .byte 100 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 1 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SCARY_FACE - .byte EFFECT_SPEED_DOWN_2 - .byte 0 @ power - .byte TYPE_NORMAL - .byte 90 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ FAINT_ATTACK - .byte EFFECT_ALWAYS_HIT - .byte 60 @ power - .byte TYPE_DARK - .byte 0 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SWEET_KISS - .byte EFFECT_CONFUSE - .byte 0 @ power - .byte TYPE_NORMAL - .byte 75 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ BELLY_DRUM - .byte EFFECT_BELLY_DRUM - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ SLUDGE_BOMB - .byte EFFECT_POISON_HIT - .byte 90 @ power - .byte TYPE_POISON - .byte 100 @ accuracy - .byte 10 @ PP - .byte 30 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ MUD_SLAP - .byte EFFECT_ACCURACY_DOWN_HIT - .byte 20 @ power - .byte TYPE_GROUND - .byte 100 @ accuracy - .byte 10 @ PP - .byte 100 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ OCTAZOOKA - .byte EFFECT_ACCURACY_DOWN_HIT - .byte 65 @ power - .byte TYPE_WATER - .byte 85 @ accuracy - .byte 10 @ PP - .byte 50 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SPIKES - .byte EFFECT_SPIKES - .byte 0 @ power - .byte TYPE_GROUND - .byte 0 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_ENEMY_SIDE - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ ZAP_CANNON - .byte EFFECT_PARALYZE_HIT - .byte 100 @ power - .byte TYPE_ELECTRIC - .byte 50 @ accuracy - .byte 5 @ PP - .byte 100 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ FORESIGHT - .byte EFFECT_FORESIGHT - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 40 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ DESTINY_BOND - .byte EFFECT_DESTINY_BOND - .byte 0 @ power - .byte TYPE_GHOST - .byte 0 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ PERISH_SONG - .byte EFFECT_PERISH_SONG - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ ICY_WIND - .byte EFFECT_SPEED_DOWN_HIT - .byte 55 @ power - .byte TYPE_ICE - .byte 95 @ accuracy - .byte 15 @ PP - .byte 100 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ DETECT - .byte EFFECT_PROTECT - .byte 0 @ power - .byte TYPE_FIGHTING - .byte 0 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 3 @ priority - .4byte 0 @ misc. flags - -@ BONE_RUSH - .byte EFFECT_MULTI_HIT - .byte 25 @ power - .byte TYPE_GROUND - .byte 80 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ LOCK_ON - .byte EFFECT_LOCK_ON - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ OUTRAGE - .byte EFFECT_RAMPAGE - .byte 90 @ power - .byte TYPE_DRAGON - .byte 100 @ accuracy - .byte 15 @ PP - .byte 100 @ secondary effect chance - .byte F_TARGET_RANDOM - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SANDSTORM - .byte EFFECT_SANDSTORM - .byte 0 @ power - .byte TYPE_ROCK - .byte 0 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ GIGA_DRAIN - .byte EFFECT_ABSORB - .byte 60 @ power - .byte TYPE_GRASS - .byte 100 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ ENDURE - .byte EFFECT_ENDURE - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 3 @ priority - .4byte 0 @ misc. flags - -@ CHARM - .byte EFFECT_ATTACK_DOWN_2 - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ ROLLOUT - .byte EFFECT_ROLLOUT - .byte 30 @ power - .byte TYPE_ROCK - .byte 90 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ FALSE_SWIPE - .byte EFFECT_FALSE_SWIPE - .byte 40 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 40 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SWAGGER - .byte EFFECT_SWAGGER - .byte 0 @ power - .byte TYPE_NORMAL - .byte 90 @ accuracy - .byte 15 @ PP - .byte 100 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ MILK_DRINK - .byte EFFECT_SOFTBOILED - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SPARK - .byte EFFECT_PARALYZE_HIT - .byte 65 @ power - .byte TYPE_ELECTRIC - .byte 100 @ accuracy - .byte 20 @ PP - .byte 30 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ FURY_CUTTER - .byte EFFECT_FURY_CUTTER - .byte 10 @ power - .byte TYPE_BUG - .byte 95 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ STEEL_WING - .byte EFFECT_DEFENSE_UP_HIT - .byte 70 @ power - .byte TYPE_STEEL - .byte 90 @ accuracy - .byte 25 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ MEAN_LOOK - .byte EFFECT_MEAN_LOOK - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ ATTRACT - .byte EFFECT_ATTRACT - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SLEEP_TALK - .byte EFFECT_SLEEP_TALK - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ HEAL_BELL - .byte EFFECT_HEAL_BELL - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ RETURN - .byte EFFECT_RETURN - .byte 1 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ PRESENT - .byte EFFECT_PRESENT - .byte 1 @ power - .byte TYPE_NORMAL - .byte 90 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ FRUSTRATION - .byte EFFECT_FRUSTRATION - .byte 1 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SAFEGUARD - .byte EFFECT_SAFEGUARD - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 25 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ PAIN_SPLIT - .byte EFFECT_PAIN_SPLIT - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SACRED_FIRE - .byte EFFECT_THAW_HIT - .byte 100 @ power - .byte TYPE_FIRE - .byte 95 @ accuracy - .byte 5 @ PP - .byte 50 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ MAGNITUDE - .byte EFFECT_MAGNITUDE - .byte 1 @ power - .byte TYPE_GROUND - .byte 100 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_ALL_EXCEPT_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ DYNAMIC_PUNCH - .byte EFFECT_CONFUSE_HIT - .byte 100 @ power - .byte TYPE_FIGHTING - .byte 50 @ accuracy - .byte 5 @ PP - .byte 100 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ MEGAHORN - .byte EFFECT_HIT - .byte 120 @ power - .byte TYPE_BUG - .byte 85 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ DRAGON_BREATH - .byte EFFECT_PARALYZE_HIT - .byte 60 @ power - .byte TYPE_DRAGON - .byte 100 @ accuracy - .byte 20 @ PP - .byte 30 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ BATON_PASS - .byte EFFECT_BATON_PASS - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 40 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ ENCORE - .byte EFFECT_ENCORE - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ PURSUIT - .byte EFFECT_PURSUIT - .byte 40 @ power - .byte TYPE_DARK - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ RAPID_SPIN - .byte EFFECT_RAPID_SPIN - .byte 20 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 40 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SWEET_SCENT - .byte EFFECT_EVASION_DOWN - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ IRON_TAIL - .byte EFFECT_DEFENSE_DOWN_HIT - .byte 100 @ power - .byte TYPE_STEEL - .byte 75 @ accuracy - .byte 15 @ PP - .byte 30 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ METAL_CLAW - .byte EFFECT_ATTACK_UP_HIT - .byte 50 @ power - .byte TYPE_STEEL - .byte 95 @ accuracy - .byte 35 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ VITAL_THROW - .byte EFFECT_VITAL_THROW - .byte 70 @ power - .byte TYPE_FIGHTING - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte -1 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ MORNING_SUN - .byte EFFECT_MORNING_SUN - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ SYNTHESIS - .byte EFFECT_SYNTHESIS - .byte 0 @ power - .byte TYPE_GRASS - .byte 0 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ MOONLIGHT - .byte EFFECT_MOONLIGHT - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ HIDDEN_POWER - .byte EFFECT_HIDDEN_POWER - .byte 1 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ CROSS_CHOP - .byte EFFECT_HIGH_CRITICAL - .byte 100 @ power - .byte TYPE_FIGHTING - .byte 80 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ TWISTER - .byte EFFECT_TWISTER - .byte 40 @ power - .byte TYPE_DRAGON - .byte 100 @ accuracy - .byte 20 @ PP - .byte 20 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ RAIN_DANCE - .byte EFFECT_RAIN_DANCE - .byte 0 @ power - .byte TYPE_WATER - .byte 0 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ SUNNY_DAY - .byte EFFECT_SUNNY_DAY - .byte 0 @ power - .byte TYPE_FIRE - .byte 0 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ CRUNCH - .byte EFFECT_SPECIAL_DEFENSE_DOWN_HIT - .byte 80 @ power - .byte TYPE_DARK - .byte 100 @ accuracy - .byte 15 @ PP - .byte 20 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ MIRROR_COAT - .byte EFFECT_MIRROR_COAT - .byte 1 @ power - .byte TYPE_PSYCHIC - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL - .byte -5 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE @ misc. flags - -@ PSYCH_UP - .byte EFFECT_PSYCH_UP - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ EXTREME_SPEED - .byte EFFECT_QUICK_ATTACK - .byte 80 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 1 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ ANCIENT_POWER - .byte EFFECT_ALL_STATS_UP_HIT - .byte 60 @ power - .byte TYPE_ROCK - .byte 100 @ accuracy - .byte 5 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SHADOW_BALL - .byte EFFECT_SPECIAL_DEFENSE_DOWN_HIT - .byte 80 @ power - .byte TYPE_GHOST - .byte 100 @ accuracy - .byte 15 @ PP - .byte 20 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ FUTURE_SIGHT - .byte EFFECT_FUTURE_SIGHT - .byte 80 @ power - .byte TYPE_PSYCHIC - .byte 90 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ ROCK_SMASH - .byte EFFECT_DEFENSE_DOWN_HIT - .byte 20 @ power - .byte TYPE_FIGHTING - .byte 100 @ accuracy - .byte 15 @ PP - .byte 50 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ WHIRLPOOL - .byte EFFECT_TRAP - .byte 15 @ power - .byte TYPE_WATER - .byte 70 @ accuracy - .byte 15 @ PP - .byte 100 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ BEAT_UP - .byte EFFECT_BEAT_UP - .byte 10 @ power - .byte TYPE_DARK - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ FAKE_OUT - .byte EFFECT_FAKE_OUT - .byte 40 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 1 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ UPROAR - .byte EFFECT_UPROAR - .byte 50 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 10 @ PP - .byte 100 @ secondary effect chance - .byte F_TARGET_RANDOM - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ STOCKPILE - .byte EFFECT_STOCKPILE - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ SPIT_UP - .byte EFFECT_SPIT_UP - .byte 100 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SWALLOW - .byte EFFECT_SWALLOW - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ HEAT_WAVE - .byte EFFECT_BURN_HIT - .byte 100 @ power - .byte TYPE_FIRE - .byte 90 @ accuracy - .byte 10 @ PP - .byte 10 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ HAIL - .byte EFFECT_HAIL - .byte 0 @ power - .byte TYPE_ICE - .byte 0 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_PROTECT @ misc. flags - -@ TORMENT - .byte EFFECT_TORMENT - .byte 0 @ power - .byte TYPE_DARK - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ FLATTER - .byte EFFECT_FLATTER - .byte 0 @ power - .byte TYPE_DARK - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ WILL_O_WISP - .byte EFFECT_WILL_O_WISP - .byte 0 @ power - .byte TYPE_FIRE - .byte 75 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ MEMENTO - .byte EFFECT_MEMENTO - .byte 0 @ power - .byte TYPE_DARK - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ FACADE - .byte EFFECT_FACADE - .byte 70 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ FOCUS_PUNCH - .byte EFFECT_FOCUS_PUNCH - .byte 150 @ power - .byte TYPE_FIGHTING - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte -3 @ priority - .4byte F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SMELLING_SALT - .byte EFFECT_SMELLINGSALT - .byte 60 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ FOLLOW_ME - .byte EFFECT_FOLLOW_ME - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 3 @ priority - .4byte 0 @ misc. flags - -@ NATURE_POWER - .byte EFFECT_NATURE_POWER - .byte 0 @ power - .byte TYPE_NORMAL - .byte 95 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ CHARGE - .byte EFFECT_CHARGE - .byte 0 @ power - .byte TYPE_ELECTRIC - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ TAUNT - .byte EFFECT_TAUNT - .byte 0 @ power - .byte TYPE_DARK - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_PROTECT @ misc. flags - -@ HELPING_HAND - .byte EFFECT_HELPING_HAND - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 5 @ priority - .4byte 0 @ misc. flags - -@ TRICK - .byte EFFECT_TRICK - .byte 0 @ power - .byte TYPE_PSYCHIC - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ ROLE_PLAY - .byte EFFECT_ROLE_PLAY - .byte 0 @ power - .byte TYPE_PSYCHIC - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ WISH - .byte EFFECT_WISH - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_PROTECT @ misc. flags - -@ ASSIST - .byte EFFECT_ASSIST - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ INGRAIN - .byte EFFECT_INGRAIN - .byte 0 @ power - .byte TYPE_GRASS - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ SUPERPOWER - .byte EFFECT_SUPERPOWER - .byte 120 @ power - .byte TYPE_FIGHTING - .byte 100 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ MAGIC_COAT - .byte EFFECT_MAGIC_COAT - .byte 0 @ power - .byte TYPE_PSYCHIC - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL - .byte 4 @ priority - .4byte 0 @ misc. flags - -@ RECYCLE - .byte EFFECT_RECYCLE - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ REVENGE - .byte EFFECT_REVENGE - .byte 60 @ power - .byte TYPE_FIGHTING - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte -4 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ BRICK_BREAK - .byte EFFECT_BRICK_BREAK - .byte 75 @ power - .byte TYPE_FIGHTING - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ YAWN - .byte EFFECT_YAWN - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ KNOCK_OFF - .byte EFFECT_KNOCK_OFF - .byte 20 @ power - .byte TYPE_DARK - .byte 100 @ accuracy - .byte 20 @ PP - .byte 100 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ ENDEAVOR - .byte EFFECT_ENDEAVOR - .byte 1 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ ERUPTION - .byte EFFECT_ERUPTION - .byte 150 @ power - .byte TYPE_FIRE - .byte 100 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SKILL_SWAP - .byte EFFECT_SKILL_SWAP - .byte 0 @ power - .byte TYPE_PSYCHIC - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ IMPRISON - .byte EFFECT_IMPRISON - .byte 0 @ power - .byte TYPE_PSYCHIC - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_PROTECT @ misc. flags - -@ REFRESH - .byte EFFECT_REFRESH - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ GRUDGE - .byte EFFECT_GRUDGE - .byte 0 @ power - .byte TYPE_GHOST - .byte 100 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SNATCH - .byte EFFECT_SNATCH - .byte 0 @ power - .byte TYPE_DARK - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_SPECIAL - .byte 4 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE @ misc. flags - -@ SECRET_POWER - .byte EFFECT_SECRET_POWER - .byte 70 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 20 @ PP - .byte 30 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ DIVE - .byte EFFECT_FLY - .byte 60 @ power - .byte TYPE_WATER - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ ARM_THRUST - .byte EFFECT_MULTI_HIT - .byte 15 @ power - .byte TYPE_FIGHTING - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ CAMOUFLAGE - .byte EFFECT_CAMOUFLAGE - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ TAIL_GLOW - .byte EFFECT_SPECIAL_ATTACK_UP_2 - .byte 0 @ power - .byte TYPE_BUG - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ LUSTER_PURGE - .byte EFFECT_SPECIAL_DEFENSE_DOWN_HIT - .byte 70 @ power - .byte TYPE_PSYCHIC - .byte 100 @ accuracy - .byte 5 @ PP - .byte 50 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ MIST_BALL - .byte EFFECT_SPECIAL_ATTACK_DOWN_HIT - .byte 70 @ power - .byte TYPE_PSYCHIC - .byte 100 @ accuracy - .byte 5 @ PP - .byte 50 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ FEATHER_DANCE - .byte EFFECT_ATTACK_DOWN_2 - .byte 0 @ power - .byte TYPE_FLYING - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ TEETER_DANCE - .byte EFFECT_TEETER_DANCE - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_ALL_EXCEPT_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_PROTECT @ misc. flags - -@ BLAZE_KICK - .byte EFFECT_BLAZE_KICK - .byte 85 @ power - .byte TYPE_FIRE - .byte 90 @ accuracy - .byte 10 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ MUD_SPORT - .byte EFFECT_MUD_SPORT - .byte 0 @ power - .byte TYPE_GROUND - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ ICE_BALL - .byte EFFECT_ROLLOUT - .byte 30 @ power - .byte TYPE_ICE - .byte 90 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ NEEDLE_ARM - .byte EFFECT_FLINCH_HIT_2 - .byte 60 @ power - .byte TYPE_GRASS - .byte 100 @ accuracy - .byte 15 @ PP - .byte 30 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SLACK_OFF - .byte EFFECT_RESTORE_HP - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ HYPER_VOICE - .byte EFFECT_HIT - .byte 90 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ POISON_FANG - .byte EFFECT_POISON_FANG - .byte 50 @ power - .byte TYPE_POISON - .byte 100 @ accuracy - .byte 15 @ PP - .byte 30 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ CRUSH_CLAW - .byte EFFECT_DEFENSE_DOWN_HIT - .byte 75 @ power - .byte TYPE_NORMAL - .byte 95 @ accuracy - .byte 10 @ PP - .byte 50 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ BLAST_BURN - .byte EFFECT_RECHARGE - .byte 150 @ power - .byte TYPE_FIRE - .byte 90 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ HYDRO_CANNON - .byte EFFECT_RECHARGE - .byte 150 @ power - .byte TYPE_WATER - .byte 90 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ METEOR_MASH - .byte EFFECT_ATTACK_UP_HIT - .byte 100 @ power - .byte TYPE_STEEL - .byte 85 @ accuracy - .byte 10 @ PP - .byte 20 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ ASTONISH - .byte EFFECT_FLINCH_HIT_2 - .byte 30 @ power - .byte TYPE_GHOST - .byte 100 @ accuracy - .byte 15 @ PP - .byte 30 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ WEATHER_BALL - .byte EFFECT_WEATHER_BALL - .byte 50 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ AROMATHERAPY - .byte EFFECT_HEAL_BELL - .byte 0 @ power - .byte TYPE_GRASS - .byte 0 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ FAKE_TEARS - .byte EFFECT_SPECIAL_DEFENSE_DOWN_2 - .byte 0 @ power - .byte TYPE_DARK - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ AIR_CUTTER - .byte EFFECT_HIGH_CRITICAL - .byte 55 @ power - .byte TYPE_FLYING - .byte 95 @ accuracy - .byte 25 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ OVERHEAT - .byte EFFECT_OVERHEAT - .byte 140 @ power - .byte TYPE_FIRE - .byte 90 @ accuracy - .byte 5 @ PP - .byte 100 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ ODOR_SLEUTH - .byte EFFECT_FORESIGHT - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 40 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ ROCK_TOMB - .byte EFFECT_SPEED_DOWN_HIT - .byte 50 @ power - .byte TYPE_ROCK - .byte 80 @ accuracy - .byte 10 @ PP - .byte 100 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SILVER_WIND - .byte EFFECT_ALL_STATS_UP_HIT - .byte 60 @ power - .byte TYPE_BUG - .byte 100 @ accuracy - .byte 5 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ METAL_SOUND - .byte EFFECT_SPECIAL_DEFENSE_DOWN_2 - .byte 0 @ power - .byte TYPE_STEEL - .byte 85 @ accuracy - .byte 40 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ GRASS_WHISTLE - .byte EFFECT_SLEEP - .byte 0 @ power - .byte TYPE_GRASS - .byte 55 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ TICKLE - .byte EFFECT_TICKLE - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ COSMIC_POWER - .byte EFFECT_COSMIC_POWER - .byte 0 @ power - .byte TYPE_PSYCHIC - .byte 0 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ WATER_SPOUT - .byte EFFECT_ERUPTION - .byte 150 @ power - .byte TYPE_WATER - .byte 100 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SIGNAL_BEAM - .byte EFFECT_CONFUSE_HIT - .byte 75 @ power - .byte TYPE_BUG - .byte 100 @ accuracy - .byte 15 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SHADOW_PUNCH - .byte EFFECT_ALWAYS_HIT - .byte 60 @ power - .byte TYPE_GHOST - .byte 0 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ EXTRASENSORY - .byte EFFECT_FLINCH_HIT_2 - .byte 80 @ power - .byte TYPE_PSYCHIC - .byte 100 @ accuracy - .byte 30 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SKY_UPPERCUT - .byte EFFECT_SKY_UPPERCUT - .byte 85 @ power - .byte TYPE_FIGHTING - .byte 90 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ SAND_TOMB - .byte EFFECT_TRAP - .byte 15 @ power - .byte TYPE_GROUND - .byte 70 @ accuracy - .byte 15 @ PP - .byte 100 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SHEER_COLD - .byte EFFECT_OHKO - .byte 1 @ power - .byte TYPE_ICE - .byte 30 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ MUDDY_WATER - .byte EFFECT_ACCURACY_DOWN_HIT - .byte 95 @ power - .byte TYPE_WATER - .byte 85 @ accuracy - .byte 10 @ PP - .byte 30 @ secondary effect chance - .byte F_TARGET_BOTH_ENEMIES - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ BULLET_SEED - .byte EFFECT_MULTI_HIT - .byte 10 @ power - .byte TYPE_GRASS - .byte 100 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ AERIAL_ACE - .byte EFFECT_ALWAYS_HIT - .byte 60 @ power - .byte TYPE_FLYING - .byte 0 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ ICICLE_SPEAR - .byte EFFECT_MULTI_HIT - .byte 10 @ power - .byte TYPE_ICE - .byte 100 @ accuracy - .byte 30 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ IRON_DEFENSE - .byte EFFECT_DEFENSE_UP_2 - .byte 0 @ power - .byte TYPE_STEEL - .byte 0 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ BLOCK - .byte EFFECT_MEAN_LOOK - .byte 0 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags - -@ HOWL - .byte EFFECT_ATTACK_UP - .byte 0 @ power - .byte TYPE_NORMAL - .byte 0 @ accuracy - .byte 40 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ DRAGON_CLAW - .byte EFFECT_HIT - .byte 80 @ power - .byte TYPE_DRAGON - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ FRENZY_PLANT - .byte EFFECT_RECHARGE - .byte 150 @ power - .byte TYPE_GRASS - .byte 90 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ BULK_UP - .byte EFFECT_BULK_UP - .byte 0 @ power - .byte TYPE_FIGHTING - .byte 0 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ BOUNCE - .byte EFFECT_FLY - .byte 85 @ power - .byte TYPE_FLYING - .byte 85 @ accuracy - .byte 5 @ PP - .byte 30 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ MUD_SHOT - .byte EFFECT_SPEED_DOWN_HIT - .byte 55 @ power - .byte TYPE_GROUND - .byte 95 @ accuracy - .byte 15 @ PP - .byte 100 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ POISON_TAIL - .byte EFFECT_POISON_TAIL - .byte 50 @ power - .byte TYPE_POISON - .byte 100 @ accuracy - .byte 25 @ PP - .byte 10 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ COVET - .byte EFFECT_THIEF - .byte 40 @ power - .byte TYPE_NORMAL - .byte 100 @ accuracy - .byte 40 @ PP - .byte 100 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ VOLT_TACKLE - .byte EFFECT_DOUBLE_EDGE - .byte 120 @ power - .byte TYPE_ELECTRIC - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ MAGICAL_LEAF - .byte EFFECT_ALWAYS_HIT - .byte 60 @ power - .byte TYPE_GRASS - .byte 0 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ WATER_SPORT - .byte EFFECT_WATER_SPORT - .byte 0 @ power - .byte TYPE_WATER - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ CALM_MIND - .byte EFFECT_CALM_MIND - .byte 0 @ power - .byte TYPE_PSYCHIC - .byte 0 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ LEAF_BLADE - .byte EFFECT_HIGH_CRITICAL - .byte 70 @ power - .byte TYPE_GRASS - .byte 100 @ accuracy - .byte 15 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags - -@ DRAGON_DANCE - .byte EFFECT_DRAGON_DANCE - .byte 0 @ power - .byte TYPE_DRAGON - .byte 0 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte F_TARGET_USER - .byte 0 @ priority - .4byte F_AFFECTED_BY_SNATCH @ misc. flags - -@ ROCK_BLAST - .byte EFFECT_MULTI_HIT - .byte 25 @ power - .byte TYPE_ROCK - .byte 80 @ accuracy - .byte 10 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ SHOCK_WAVE - .byte EFFECT_ALWAYS_HIT - .byte 60 @ power - .byte TYPE_ELECTRIC - .byte 0 @ accuracy - .byte 20 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ WATER_PULSE - .byte EFFECT_CONFUSE_HIT - .byte 60 @ power - .byte TYPE_WATER - .byte 100 @ accuracy - .byte 20 @ PP - .byte 20 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags - -@ DOOM_DESIRE - .byte EFFECT_FUTURE_SIGHT - .byte 120 @ power - .byte TYPE_STEEL - .byte 85 @ accuracy - .byte 5 @ PP - .byte 0 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte 0 @ misc. flags - -@ PSYCHO_BOOST - .byte EFFECT_OVERHEAT - .byte 140 @ power - .byte TYPE_PSYCHIC - .byte 90 @ accuracy - .byte 5 @ PP - .byte 100 @ secondary effect chance - .byte TARGET_SELECTED_POKEMON - .byte 0 @ priority - .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags diff --git a/data/battle_moves.s b/data/battle_moves.s new file mode 100644 index 000000000..ea32446d2 --- /dev/null +++ b/data/battle_moves.s @@ -0,0 +1,3911 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gBattleMoves:: @ 81FB12C +@ NONE + .byte EFFECT_HIT + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 0 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ POUND + .byte EFFECT_HIT + .byte 40 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 35 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ KARATE_CHOP + .byte EFFECT_HIGH_CRITICAL + .byte 50 @ power + .byte TYPE_FIGHTING + .byte 100 @ accuracy + .byte 25 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ DOUBLE_SLAP + .byte EFFECT_MULTI_HIT + .byte 15 @ power + .byte TYPE_NORMAL + .byte 85 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ COMET_PUNCH + .byte EFFECT_MULTI_HIT + .byte 18 @ power + .byte TYPE_NORMAL + .byte 85 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ MEGA_PUNCH + .byte EFFECT_HIT + .byte 80 @ power + .byte TYPE_NORMAL + .byte 85 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ PAY_DAY + .byte EFFECT_PAY_DAY + .byte 40 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 20 @ PP + .byte 100 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ FIRE_PUNCH + .byte EFFECT_BURN_HIT + .byte 75 @ power + .byte TYPE_FIRE + .byte 100 @ accuracy + .byte 15 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ ICE_PUNCH + .byte EFFECT_FREEZE_HIT + .byte 75 @ power + .byte TYPE_ICE + .byte 100 @ accuracy + .byte 15 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ THUNDER_PUNCH + .byte EFFECT_PARALYZE_HIT + .byte 75 @ power + .byte TYPE_ELECTRIC + .byte 100 @ accuracy + .byte 15 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SCRATCH + .byte EFFECT_HIT + .byte 40 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 35 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ VICE_GRIP + .byte EFFECT_HIT + .byte 55 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ GUILLOTINE + .byte EFFECT_OHKO + .byte 1 @ power + .byte TYPE_NORMAL + .byte 30 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ RAZOR_WIND + .byte EFFECT_RAZOR_WIND + .byte 80 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_BOTH_ENEMIES + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SWORDS_DANCE + .byte EFFECT_ATTACK_UP_2 + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ CUT + .byte EFFECT_HIT + .byte 50 @ power + .byte TYPE_NORMAL + .byte 95 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ GUST + .byte EFFECT_GUST + .byte 40 @ power + .byte TYPE_FLYING + .byte 100 @ accuracy + .byte 35 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ WING_ATTACK + .byte EFFECT_HIT + .byte 60 @ power + .byte TYPE_FLYING + .byte 100 @ accuracy + .byte 35 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ WHIRLWIND + .byte EFFECT_ROAR + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte -6 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ FLY + .byte EFFECT_FLY + .byte 70 @ power + .byte TYPE_FLYING + .byte 95 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ BIND + .byte EFFECT_TRAP + .byte 15 @ power + .byte TYPE_NORMAL + .byte 75 @ accuracy + .byte 20 @ PP + .byte 100 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SLAM + .byte EFFECT_HIT + .byte 80 @ power + .byte TYPE_NORMAL + .byte 75 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ VINE_WHIP + .byte EFFECT_HIT + .byte 35 @ power + .byte TYPE_GRASS + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ STOMP + .byte EFFECT_FLINCH_HIT_2 + .byte 65 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 20 @ PP + .byte 30 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ DOUBLE_KICK + .byte EFFECT_DOUBLE_HIT + .byte 30 @ power + .byte TYPE_FIGHTING + .byte 100 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ MEGA_KICK + .byte EFFECT_HIT + .byte 120 @ power + .byte TYPE_NORMAL + .byte 75 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ JUMP_KICK + .byte EFFECT_RECOIL_IF_MISS + .byte 70 @ power + .byte TYPE_FIGHTING + .byte 95 @ accuracy + .byte 25 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ ROLLING_KICK + .byte EFFECT_FLINCH_HIT + .byte 60 @ power + .byte TYPE_FIGHTING + .byte 85 @ accuracy + .byte 15 @ PP + .byte 30 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SAND_ATTACK + .byte EFFECT_ACCURACY_DOWN + .byte 0 @ power + .byte TYPE_GROUND + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ HEADBUTT + .byte EFFECT_FLINCH_HIT + .byte 70 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 15 @ PP + .byte 30 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ HORN_ATTACK + .byte EFFECT_HIT + .byte 65 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 25 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ FURY_ATTACK + .byte EFFECT_MULTI_HIT + .byte 15 @ power + .byte TYPE_NORMAL + .byte 85 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ HORN_DRILL + .byte EFFECT_OHKO + .byte 1 @ power + .byte TYPE_NORMAL + .byte 30 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ TACKLE + .byte EFFECT_HIT + .byte 35 @ power + .byte TYPE_NORMAL + .byte 95 @ accuracy + .byte 35 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ BODY_SLAM + .byte EFFECT_PARALYZE_HIT + .byte 85 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 15 @ PP + .byte 30 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ WRAP + .byte EFFECT_TRAP + .byte 15 @ power + .byte TYPE_NORMAL + .byte 85 @ accuracy + .byte 20 @ PP + .byte 100 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ TAKE_DOWN + .byte EFFECT_RECOIL + .byte 90 @ power + .byte TYPE_NORMAL + .byte 85 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ THRASH + .byte EFFECT_RAMPAGE + .byte 90 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 20 @ PP + .byte 100 @ secondary effect chance + .byte F_TARGET_RANDOM + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ DOUBLE_EDGE + .byte EFFECT_DOUBLE_EDGE + .byte 120 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ TAIL_WHIP + .byte EFFECT_DEFENSE_DOWN + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_BOTH_ENEMIES + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ POISON_STING + .byte EFFECT_POISON_HIT + .byte 15 @ power + .byte TYPE_POISON + .byte 100 @ accuracy + .byte 35 @ PP + .byte 30 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ TWINEEDLE + .byte EFFECT_TWINEEDLE + .byte 25 @ power + .byte TYPE_BUG + .byte 100 @ accuracy + .byte 20 @ PP + .byte 20 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ PIN_MISSILE + .byte EFFECT_MULTI_HIT + .byte 14 @ power + .byte TYPE_BUG + .byte 85 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ LEER + .byte EFFECT_DEFENSE_DOWN + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_BOTH_ENEMIES + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ BITE + .byte EFFECT_FLINCH_HIT + .byte 60 @ power + .byte TYPE_DARK + .byte 100 @ accuracy + .byte 25 @ PP + .byte 30 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ GROWL + .byte EFFECT_ATTACK_DOWN + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 40 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_BOTH_ENEMIES + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ ROAR + .byte EFFECT_ROAR + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte -6 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SING + .byte EFFECT_SLEEP + .byte 0 @ power + .byte TYPE_NORMAL + .byte 55 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SUPERSONIC + .byte EFFECT_CONFUSE + .byte 0 @ power + .byte TYPE_NORMAL + .byte 55 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SONIC_BOOM + .byte EFFECT_SONICBOOM + .byte 1 @ power + .byte TYPE_NORMAL + .byte 90 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ DISABLE + .byte EFFECT_DISABLE + .byte 0 @ power + .byte TYPE_NORMAL + .byte 55 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ ACID + .byte EFFECT_DEFENSE_DOWN_HIT + .byte 40 @ power + .byte TYPE_POISON + .byte 100 @ accuracy + .byte 30 @ PP + .byte 10 @ secondary effect chance + .byte F_TARGET_BOTH_ENEMIES + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ EMBER + .byte EFFECT_BURN_HIT + .byte 40 @ power + .byte TYPE_FIRE + .byte 100 @ accuracy + .byte 25 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ FLAMETHROWER + .byte EFFECT_BURN_HIT + .byte 95 @ power + .byte TYPE_FIRE + .byte 100 @ accuracy + .byte 15 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ MIST + .byte EFFECT_MIST + .byte 0 @ power + .byte TYPE_ICE + .byte 0 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ WATER_GUN + .byte EFFECT_HIT + .byte 40 @ power + .byte TYPE_WATER + .byte 100 @ accuracy + .byte 25 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ HYDRO_PUMP + .byte EFFECT_HIT + .byte 120 @ power + .byte TYPE_WATER + .byte 80 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SURF + .byte EFFECT_HIT + .byte 95 @ power + .byte TYPE_WATER + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_BOTH_ENEMIES + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ ICE_BEAM + .byte EFFECT_FREEZE_HIT + .byte 95 @ power + .byte TYPE_ICE + .byte 100 @ accuracy + .byte 10 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ BLIZZARD + .byte EFFECT_FREEZE_HIT + .byte 120 @ power + .byte TYPE_ICE + .byte 70 @ accuracy + .byte 5 @ PP + .byte 10 @ secondary effect chance + .byte F_TARGET_BOTH_ENEMIES + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ PSYBEAM + .byte EFFECT_CONFUSE_HIT + .byte 65 @ power + .byte TYPE_PSYCHIC + .byte 100 @ accuracy + .byte 20 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ BUBBLE_BEAM + .byte EFFECT_SPEED_DOWN_HIT + .byte 65 @ power + .byte TYPE_WATER + .byte 100 @ accuracy + .byte 20 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ AURORA_BEAM + .byte EFFECT_ATTACK_DOWN_HIT + .byte 65 @ power + .byte TYPE_ICE + .byte 100 @ accuracy + .byte 20 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ HYPER_BEAM + .byte EFFECT_RECHARGE + .byte 150 @ power + .byte TYPE_NORMAL + .byte 90 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ PECK + .byte EFFECT_HIT + .byte 35 @ power + .byte TYPE_FLYING + .byte 100 @ accuracy + .byte 35 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ DRILL_PECK + .byte EFFECT_HIT + .byte 80 @ power + .byte TYPE_FLYING + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SUBMISSION + .byte EFFECT_RECOIL + .byte 80 @ power + .byte TYPE_FIGHTING + .byte 80 @ accuracy + .byte 25 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ LOW_KICK + .byte EFFECT_LOW_KICK + .byte 1 @ power + .byte TYPE_FIGHTING + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ COUNTER + .byte EFFECT_COUNTER + .byte 1 @ power + .byte TYPE_FIGHTING + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_SPECIAL + .byte -5 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_MAKES_CONTACT @ misc. flags + +@ SEISMIC_TOSS + .byte EFFECT_LEVEL_DAMAGE + .byte 1 @ power + .byte TYPE_FIGHTING + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ STRENGTH + .byte EFFECT_HIT + .byte 80 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ ABSORB + .byte EFFECT_ABSORB + .byte 20 @ power + .byte TYPE_GRASS + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ MEGA_DRAIN + .byte EFFECT_ABSORB + .byte 40 @ power + .byte TYPE_GRASS + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ LEECH_SEED + .byte EFFECT_LEECH_SEED + .byte 0 @ power + .byte TYPE_GRASS + .byte 90 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ GROWTH + .byte EFFECT_SPECIAL_ATTACK_UP + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 40 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ RAZOR_LEAF + .byte EFFECT_HIGH_CRITICAL + .byte 55 @ power + .byte TYPE_GRASS + .byte 95 @ accuracy + .byte 25 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_BOTH_ENEMIES + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SOLAR_BEAM + .byte EFFECT_SOLARBEAM + .byte 120 @ power + .byte TYPE_GRASS + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ POISON_POWDER + .byte EFFECT_POISON + .byte 0 @ power + .byte TYPE_POISON + .byte 75 @ accuracy + .byte 35 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ STUN_SPORE + .byte EFFECT_PARALYZE + .byte 0 @ power + .byte TYPE_GRASS + .byte 75 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SLEEP_POWDER + .byte EFFECT_SLEEP + .byte 0 @ power + .byte TYPE_GRASS + .byte 75 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ PETAL_DANCE + .byte EFFECT_RAMPAGE + .byte 70 @ power + .byte TYPE_GRASS + .byte 100 @ accuracy + .byte 20 @ PP + .byte 100 @ secondary effect chance + .byte F_TARGET_RANDOM + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ STRING_SHOT + .byte EFFECT_SPEED_DOWN + .byte 0 @ power + .byte TYPE_BUG + .byte 95 @ accuracy + .byte 40 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_BOTH_ENEMIES + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ DRAGON_RAGE + .byte EFFECT_DRAGON_RAGE + .byte 1 @ power + .byte TYPE_DRAGON + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ FIRE_SPIN + .byte EFFECT_TRAP + .byte 15 @ power + .byte TYPE_FIRE + .byte 70 @ accuracy + .byte 15 @ PP + .byte 100 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ THUNDER_SHOCK + .byte EFFECT_PARALYZE_HIT + .byte 40 @ power + .byte TYPE_ELECTRIC + .byte 100 @ accuracy + .byte 30 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ THUNDERBOLT + .byte EFFECT_PARALYZE_HIT + .byte 95 @ power + .byte TYPE_ELECTRIC + .byte 100 @ accuracy + .byte 15 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ THUNDER_WAVE + .byte EFFECT_PARALYZE + .byte 0 @ power + .byte TYPE_ELECTRIC + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ THUNDER + .byte EFFECT_THUNDER + .byte 120 @ power + .byte TYPE_ELECTRIC + .byte 70 @ accuracy + .byte 10 @ PP + .byte 30 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ ROCK_THROW + .byte EFFECT_HIT + .byte 50 @ power + .byte TYPE_ROCK + .byte 90 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ EARTHQUAKE + .byte EFFECT_EARTHQUAKE + .byte 100 @ power + .byte TYPE_GROUND + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_ALL_EXCEPT_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ FISSURE + .byte EFFECT_OHKO + .byte 1 @ power + .byte TYPE_GROUND + .byte 30 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ DIG + .byte EFFECT_FLY + .byte 60 @ power + .byte TYPE_GROUND + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ TOXIC + .byte EFFECT_TOXIC + .byte 0 @ power + .byte TYPE_POISON + .byte 85 @ accuracy + .byte 10 @ PP + .byte 100 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ CONFUSION + .byte EFFECT_CONFUSE_HIT + .byte 50 @ power + .byte TYPE_PSYCHIC + .byte 100 @ accuracy + .byte 25 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ PSYCHIC + .byte EFFECT_SPECIAL_DEFENSE_DOWN_HIT + .byte 90 @ power + .byte TYPE_PSYCHIC + .byte 100 @ accuracy + .byte 10 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ HYPNOSIS + .byte EFFECT_SLEEP + .byte 0 @ power + .byte TYPE_PSYCHIC + .byte 60 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ MEDITATE + .byte EFFECT_ATTACK_UP + .byte 0 @ power + .byte TYPE_PSYCHIC + .byte 0 @ accuracy + .byte 40 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ AGILITY + .byte EFFECT_SPEED_UP_2 + .byte 0 @ power + .byte TYPE_PSYCHIC + .byte 0 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ QUICK_ATTACK + .byte EFFECT_QUICK_ATTACK + .byte 40 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 1 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ RAGE + .byte EFFECT_RAGE + .byte 20 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ TELEPORT + .byte EFFECT_TELEPORT + .byte 0 @ power + .byte TYPE_PSYCHIC + .byte 0 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ NIGHT_SHADE + .byte EFFECT_LEVEL_DAMAGE + .byte 1 @ power + .byte TYPE_GHOST + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ MIMIC + .byte EFFECT_MIMIC + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_PROTECT @ misc. flags + +@ SCREECH + .byte EFFECT_DEFENSE_DOWN_2 + .byte 0 @ power + .byte TYPE_NORMAL + .byte 85 @ accuracy + .byte 40 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ DOUBLE_TEAM + .byte EFFECT_EVASION_UP + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ RECOVER + .byte EFFECT_RESTORE_HP + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ HARDEN + .byte EFFECT_DEFENSE_UP + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ MINIMIZE + .byte EFFECT_MINIMIZE + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ SMOKESCREEN + .byte EFFECT_ACCURACY_DOWN + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ CONFUSE_RAY + .byte EFFECT_CONFUSE + .byte 0 @ power + .byte TYPE_GHOST + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ WITHDRAW + .byte EFFECT_DEFENSE_UP + .byte 0 @ power + .byte TYPE_WATER + .byte 0 @ accuracy + .byte 40 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ DEFENSE_CURL + .byte EFFECT_DEFENSE_CURL + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 40 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ BARRIER + .byte EFFECT_DEFENSE_UP_2 + .byte 0 @ power + .byte TYPE_PSYCHIC + .byte 0 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ LIGHT_SCREEN + .byte EFFECT_LIGHT_SCREEN + .byte 0 @ power + .byte TYPE_PSYCHIC + .byte 0 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ HAZE + .byte EFFECT_HAZE + .byte 0 @ power + .byte TYPE_ICE + .byte 0 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_PROTECT @ misc. flags + +@ REFLECT + .byte EFFECT_REFLECT + .byte 0 @ power + .byte TYPE_PSYCHIC + .byte 0 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ FOCUS_ENERGY + .byte EFFECT_FOCUS_ENERGY + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ BIDE + .byte EFFECT_BIDE + .byte 1 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ METRONOME + .byte EFFECT_METRONOME + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_SPECIAL + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ MIRROR_MOVE + .byte EFFECT_MIRROR_MOVE + .byte 0 @ power + .byte TYPE_FLYING + .byte 0 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_SPECIAL + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ SELF_DESTRUCT + .byte EFFECT_EXPLOSION + .byte 200 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_ALL_EXCEPT_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ EGG_BOMB + .byte EFFECT_HIT + .byte 100 @ power + .byte TYPE_NORMAL + .byte 75 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ LICK + .byte EFFECT_PARALYZE_HIT + .byte 20 @ power + .byte TYPE_GHOST + .byte 100 @ accuracy + .byte 30 @ PP + .byte 30 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SMOG + .byte EFFECT_POISON_HIT + .byte 20 @ power + .byte TYPE_POISON + .byte 70 @ accuracy + .byte 20 @ PP + .byte 40 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SLUDGE + .byte EFFECT_POISON_HIT + .byte 65 @ power + .byte TYPE_POISON + .byte 100 @ accuracy + .byte 20 @ PP + .byte 30 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ BONE_CLUB + .byte EFFECT_FLINCH_HIT + .byte 65 @ power + .byte TYPE_GROUND + .byte 85 @ accuracy + .byte 20 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ FIRE_BLAST + .byte EFFECT_BURN_HIT + .byte 120 @ power + .byte TYPE_FIRE + .byte 85 @ accuracy + .byte 5 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ WATERFALL + .byte EFFECT_HIT + .byte 80 @ power + .byte TYPE_WATER + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ CLAMP + .byte EFFECT_TRAP + .byte 35 @ power + .byte TYPE_WATER + .byte 75 @ accuracy + .byte 10 @ PP + .byte 100 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SWIFT + .byte EFFECT_ALWAYS_HIT + .byte 60 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_BOTH_ENEMIES + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SKULL_BASH + .byte EFFECT_SKULL_BASH + .byte 100 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SPIKE_CANNON + .byte EFFECT_MULTI_HIT + .byte 20 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ CONSTRICT + .byte EFFECT_SPEED_DOWN_HIT + .byte 10 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 35 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ AMNESIA + .byte EFFECT_SPECIAL_DEFENSE_UP_2 + .byte 0 @ power + .byte TYPE_PSYCHIC + .byte 0 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ KINESIS + .byte EFFECT_ACCURACY_DOWN + .byte 0 @ power + .byte TYPE_PSYCHIC + .byte 80 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SOFT_BOILED + .byte EFFECT_SOFTBOILED + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_SNATCH @ misc. flags + +@ HI_JUMP_KICK + .byte EFFECT_RECOIL_IF_MISS + .byte 85 @ power + .byte TYPE_FIGHTING + .byte 90 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ GLARE + .byte EFFECT_PARALYZE + .byte 0 @ power + .byte TYPE_NORMAL + .byte 75 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ DREAM_EATER + .byte EFFECT_DREAM_EATER + .byte 100 @ power + .byte TYPE_PSYCHIC + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ POISON_GAS + .byte EFFECT_POISON + .byte 0 @ power + .byte TYPE_POISON + .byte 55 @ accuracy + .byte 40 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ BARRAGE + .byte EFFECT_MULTI_HIT + .byte 15 @ power + .byte TYPE_NORMAL + .byte 85 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ LEECH_LIFE + .byte EFFECT_ABSORB + .byte 20 @ power + .byte TYPE_BUG + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ LOVELY_KISS + .byte EFFECT_SLEEP + .byte 0 @ power + .byte TYPE_NORMAL + .byte 75 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SKY_ATTACK + .byte EFFECT_SKY_ATTACK + .byte 140 @ power + .byte TYPE_FLYING + .byte 90 @ accuracy + .byte 5 @ PP + .byte 30 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ TRANSFORM + .byte EFFECT_TRANSFORM + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ BUBBLE + .byte EFFECT_SPEED_DOWN_HIT + .byte 20 @ power + .byte TYPE_WATER + .byte 100 @ accuracy + .byte 30 @ PP + .byte 10 @ secondary effect chance + .byte F_TARGET_BOTH_ENEMIES + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ DIZZY_PUNCH + .byte EFFECT_CONFUSE_HIT + .byte 70 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 10 @ PP + .byte 20 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SPORE + .byte EFFECT_SLEEP + .byte 0 @ power + .byte TYPE_GRASS + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ FLASH + .byte EFFECT_ACCURACY_DOWN + .byte 0 @ power + .byte TYPE_NORMAL + .byte 70 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ PSYWAVE + .byte EFFECT_PSYWAVE + .byte 1 @ power + .byte TYPE_PSYCHIC + .byte 80 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SPLASH + .byte EFFECT_SPLASH + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 40 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ ACID_ARMOR + .byte EFFECT_DEFENSE_UP_2 + .byte 0 @ power + .byte TYPE_POISON + .byte 0 @ accuracy + .byte 40 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ CRABHAMMER + .byte EFFECT_HIGH_CRITICAL + .byte 90 @ power + .byte TYPE_WATER + .byte 85 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ EXPLOSION + .byte EFFECT_EXPLOSION + .byte 250 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_ALL_EXCEPT_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ FURY_SWIPES + .byte EFFECT_MULTI_HIT + .byte 18 @ power + .byte TYPE_NORMAL + .byte 80 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ BONEMERANG + .byte EFFECT_DOUBLE_HIT + .byte 50 @ power + .byte TYPE_GROUND + .byte 90 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ REST + .byte EFFECT_REST + .byte 0 @ power + .byte TYPE_PSYCHIC + .byte 0 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ ROCK_SLIDE + .byte EFFECT_FLINCH_HIT + .byte 75 @ power + .byte TYPE_ROCK + .byte 90 @ accuracy + .byte 10 @ PP + .byte 30 @ secondary effect chance + .byte F_TARGET_BOTH_ENEMIES + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ HYPER_FANG + .byte EFFECT_FLINCH_HIT + .byte 80 @ power + .byte TYPE_NORMAL + .byte 90 @ accuracy + .byte 15 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SHARPEN + .byte EFFECT_ATTACK_UP + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ CONVERSION + .byte EFFECT_CONVERSION + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ TRI_ATTACK + .byte EFFECT_TRI_ATTACK + .byte 80 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 10 @ PP + .byte 20 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SUPER_FANG + .byte EFFECT_SUPER_FANG + .byte 1 @ power + .byte TYPE_NORMAL + .byte 90 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SLASH + .byte EFFECT_HIGH_CRITICAL + .byte 70 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SUBSTITUTE + .byte EFFECT_SUBSTITUTE + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ STRUGGLE + .byte EFFECT_RECOIL + .byte 50 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 1 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SKETCH + .byte EFFECT_SKETCH + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 1 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ TRIPLE_KICK + .byte EFFECT_TRIPLE_KICK + .byte 10 @ power + .byte TYPE_FIGHTING + .byte 90 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ THIEF + .byte EFFECT_THIEF + .byte 40 @ power + .byte TYPE_DARK + .byte 100 @ accuracy + .byte 10 @ PP + .byte 100 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SPIDER_WEB + .byte EFFECT_MEAN_LOOK + .byte 0 @ power + .byte TYPE_BUG + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ MIND_READER + .byte EFFECT_LOCK_ON + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ NIGHTMARE + .byte EFFECT_NIGHTMARE + .byte 0 @ power + .byte TYPE_GHOST + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ FLAME_WHEEL + .byte EFFECT_THAW_HIT + .byte 60 @ power + .byte TYPE_FIRE + .byte 100 @ accuracy + .byte 25 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SNORE + .byte EFFECT_SNORE + .byte 40 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 15 @ PP + .byte 30 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ CURSE + .byte EFFECT_CURSE + .byte 0 @ power + .byte TYPE_MYSTERY + .byte 0 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ FLAIL + .byte EFFECT_FLAIL + .byte 1 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ CONVERSION_2 + .byte EFFECT_CONVERSION_2 + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ AEROBLAST + .byte EFFECT_HIGH_CRITICAL + .byte 100 @ power + .byte TYPE_FLYING + .byte 95 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ COTTON_SPORE + .byte EFFECT_SPEED_DOWN_2 + .byte 0 @ power + .byte TYPE_GRASS + .byte 85 @ accuracy + .byte 40 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ REVERSAL + .byte EFFECT_FLAIL + .byte 1 @ power + .byte TYPE_FIGHTING + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SPITE + .byte EFFECT_SPITE + .byte 0 @ power + .byte TYPE_GHOST + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ POWDER_SNOW + .byte EFFECT_FREEZE_HIT + .byte 40 @ power + .byte TYPE_ICE + .byte 100 @ accuracy + .byte 25 @ PP + .byte 10 @ secondary effect chance + .byte F_TARGET_BOTH_ENEMIES + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ PROTECT + .byte EFFECT_PROTECT + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 3 @ priority + .4byte 0 @ misc. flags + +@ MACH_PUNCH + .byte EFFECT_QUICK_ATTACK + .byte 40 @ power + .byte TYPE_FIGHTING + .byte 100 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 1 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SCARY_FACE + .byte EFFECT_SPEED_DOWN_2 + .byte 0 @ power + .byte TYPE_NORMAL + .byte 90 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ FAINT_ATTACK + .byte EFFECT_ALWAYS_HIT + .byte 60 @ power + .byte TYPE_DARK + .byte 0 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SWEET_KISS + .byte EFFECT_CONFUSE + .byte 0 @ power + .byte TYPE_NORMAL + .byte 75 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ BELLY_DRUM + .byte EFFECT_BELLY_DRUM + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ SLUDGE_BOMB + .byte EFFECT_POISON_HIT + .byte 90 @ power + .byte TYPE_POISON + .byte 100 @ accuracy + .byte 10 @ PP + .byte 30 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ MUD_SLAP + .byte EFFECT_ACCURACY_DOWN_HIT + .byte 20 @ power + .byte TYPE_GROUND + .byte 100 @ accuracy + .byte 10 @ PP + .byte 100 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ OCTAZOOKA + .byte EFFECT_ACCURACY_DOWN_HIT + .byte 65 @ power + .byte TYPE_WATER + .byte 85 @ accuracy + .byte 10 @ PP + .byte 50 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SPIKES + .byte EFFECT_SPIKES + .byte 0 @ power + .byte TYPE_GROUND + .byte 0 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_ENEMY_SIDE + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ ZAP_CANNON + .byte EFFECT_PARALYZE_HIT + .byte 100 @ power + .byte TYPE_ELECTRIC + .byte 50 @ accuracy + .byte 5 @ PP + .byte 100 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ FORESIGHT + .byte EFFECT_FORESIGHT + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 40 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ DESTINY_BOND + .byte EFFECT_DESTINY_BOND + .byte 0 @ power + .byte TYPE_GHOST + .byte 0 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ PERISH_SONG + .byte EFFECT_PERISH_SONG + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ ICY_WIND + .byte EFFECT_SPEED_DOWN_HIT + .byte 55 @ power + .byte TYPE_ICE + .byte 95 @ accuracy + .byte 15 @ PP + .byte 100 @ secondary effect chance + .byte F_TARGET_BOTH_ENEMIES + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ DETECT + .byte EFFECT_PROTECT + .byte 0 @ power + .byte TYPE_FIGHTING + .byte 0 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 3 @ priority + .4byte 0 @ misc. flags + +@ BONE_RUSH + .byte EFFECT_MULTI_HIT + .byte 25 @ power + .byte TYPE_GROUND + .byte 80 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ LOCK_ON + .byte EFFECT_LOCK_ON + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ OUTRAGE + .byte EFFECT_RAMPAGE + .byte 90 @ power + .byte TYPE_DRAGON + .byte 100 @ accuracy + .byte 15 @ PP + .byte 100 @ secondary effect chance + .byte F_TARGET_RANDOM + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SANDSTORM + .byte EFFECT_SANDSTORM + .byte 0 @ power + .byte TYPE_ROCK + .byte 0 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ GIGA_DRAIN + .byte EFFECT_ABSORB + .byte 60 @ power + .byte TYPE_GRASS + .byte 100 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ ENDURE + .byte EFFECT_ENDURE + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 3 @ priority + .4byte 0 @ misc. flags + +@ CHARM + .byte EFFECT_ATTACK_DOWN_2 + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ ROLLOUT + .byte EFFECT_ROLLOUT + .byte 30 @ power + .byte TYPE_ROCK + .byte 90 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ FALSE_SWIPE + .byte EFFECT_FALSE_SWIPE + .byte 40 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 40 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SWAGGER + .byte EFFECT_SWAGGER + .byte 0 @ power + .byte TYPE_NORMAL + .byte 90 @ accuracy + .byte 15 @ PP + .byte 100 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ MILK_DRINK + .byte EFFECT_SOFTBOILED + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SPARK + .byte EFFECT_PARALYZE_HIT + .byte 65 @ power + .byte TYPE_ELECTRIC + .byte 100 @ accuracy + .byte 20 @ PP + .byte 30 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ FURY_CUTTER + .byte EFFECT_FURY_CUTTER + .byte 10 @ power + .byte TYPE_BUG + .byte 95 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ STEEL_WING + .byte EFFECT_DEFENSE_UP_HIT + .byte 70 @ power + .byte TYPE_STEEL + .byte 90 @ accuracy + .byte 25 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ MEAN_LOOK + .byte EFFECT_MEAN_LOOK + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ ATTRACT + .byte EFFECT_ATTRACT + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SLEEP_TALK + .byte EFFECT_SLEEP_TALK + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_SPECIAL + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ HEAL_BELL + .byte EFFECT_HEAL_BELL + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ RETURN + .byte EFFECT_RETURN + .byte 1 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ PRESENT + .byte EFFECT_PRESENT + .byte 1 @ power + .byte TYPE_NORMAL + .byte 90 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ FRUSTRATION + .byte EFFECT_FRUSTRATION + .byte 1 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SAFEGUARD + .byte EFFECT_SAFEGUARD + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 25 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ PAIN_SPLIT + .byte EFFECT_PAIN_SPLIT + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SACRED_FIRE + .byte EFFECT_THAW_HIT + .byte 100 @ power + .byte TYPE_FIRE + .byte 95 @ accuracy + .byte 5 @ PP + .byte 50 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ MAGNITUDE + .byte EFFECT_MAGNITUDE + .byte 1 @ power + .byte TYPE_GROUND + .byte 100 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_ALL_EXCEPT_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ DYNAMIC_PUNCH + .byte EFFECT_CONFUSE_HIT + .byte 100 @ power + .byte TYPE_FIGHTING + .byte 50 @ accuracy + .byte 5 @ PP + .byte 100 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ MEGAHORN + .byte EFFECT_HIT + .byte 120 @ power + .byte TYPE_BUG + .byte 85 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ DRAGON_BREATH + .byte EFFECT_PARALYZE_HIT + .byte 60 @ power + .byte TYPE_DRAGON + .byte 100 @ accuracy + .byte 20 @ PP + .byte 30 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ BATON_PASS + .byte EFFECT_BATON_PASS + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 40 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ ENCORE + .byte EFFECT_ENCORE + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ PURSUIT + .byte EFFECT_PURSUIT + .byte 40 @ power + .byte TYPE_DARK + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ RAPID_SPIN + .byte EFFECT_RAPID_SPIN + .byte 20 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 40 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SWEET_SCENT + .byte EFFECT_EVASION_DOWN + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_BOTH_ENEMIES + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ IRON_TAIL + .byte EFFECT_DEFENSE_DOWN_HIT + .byte 100 @ power + .byte TYPE_STEEL + .byte 75 @ accuracy + .byte 15 @ PP + .byte 30 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ METAL_CLAW + .byte EFFECT_ATTACK_UP_HIT + .byte 50 @ power + .byte TYPE_STEEL + .byte 95 @ accuracy + .byte 35 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ VITAL_THROW + .byte EFFECT_VITAL_THROW + .byte 70 @ power + .byte TYPE_FIGHTING + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte -1 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ MORNING_SUN + .byte EFFECT_MORNING_SUN + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ SYNTHESIS + .byte EFFECT_SYNTHESIS + .byte 0 @ power + .byte TYPE_GRASS + .byte 0 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ MOONLIGHT + .byte EFFECT_MOONLIGHT + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ HIDDEN_POWER + .byte EFFECT_HIDDEN_POWER + .byte 1 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ CROSS_CHOP + .byte EFFECT_HIGH_CRITICAL + .byte 100 @ power + .byte TYPE_FIGHTING + .byte 80 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ TWISTER + .byte EFFECT_TWISTER + .byte 40 @ power + .byte TYPE_DRAGON + .byte 100 @ accuracy + .byte 20 @ PP + .byte 20 @ secondary effect chance + .byte F_TARGET_BOTH_ENEMIES + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ RAIN_DANCE + .byte EFFECT_RAIN_DANCE + .byte 0 @ power + .byte TYPE_WATER + .byte 0 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ SUNNY_DAY + .byte EFFECT_SUNNY_DAY + .byte 0 @ power + .byte TYPE_FIRE + .byte 0 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ CRUNCH + .byte EFFECT_SPECIAL_DEFENSE_DOWN_HIT + .byte 80 @ power + .byte TYPE_DARK + .byte 100 @ accuracy + .byte 15 @ PP + .byte 20 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ MIRROR_COAT + .byte EFFECT_MIRROR_COAT + .byte 1 @ power + .byte TYPE_PSYCHIC + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_SPECIAL + .byte -5 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE @ misc. flags + +@ PSYCH_UP + .byte EFFECT_PSYCH_UP + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ EXTREME_SPEED + .byte EFFECT_QUICK_ATTACK + .byte 80 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 1 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ ANCIENT_POWER + .byte EFFECT_ALL_STATS_UP_HIT + .byte 60 @ power + .byte TYPE_ROCK + .byte 100 @ accuracy + .byte 5 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SHADOW_BALL + .byte EFFECT_SPECIAL_DEFENSE_DOWN_HIT + .byte 80 @ power + .byte TYPE_GHOST + .byte 100 @ accuracy + .byte 15 @ PP + .byte 20 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ FUTURE_SIGHT + .byte EFFECT_FUTURE_SIGHT + .byte 80 @ power + .byte TYPE_PSYCHIC + .byte 90 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ ROCK_SMASH + .byte EFFECT_DEFENSE_DOWN_HIT + .byte 20 @ power + .byte TYPE_FIGHTING + .byte 100 @ accuracy + .byte 15 @ PP + .byte 50 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ WHIRLPOOL + .byte EFFECT_TRAP + .byte 15 @ power + .byte TYPE_WATER + .byte 70 @ accuracy + .byte 15 @ PP + .byte 100 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ BEAT_UP + .byte EFFECT_BEAT_UP + .byte 10 @ power + .byte TYPE_DARK + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ FAKE_OUT + .byte EFFECT_FAKE_OUT + .byte 40 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 1 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ UPROAR + .byte EFFECT_UPROAR + .byte 50 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 10 @ PP + .byte 100 @ secondary effect chance + .byte F_TARGET_RANDOM + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ STOCKPILE + .byte EFFECT_STOCKPILE + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ SPIT_UP + .byte EFFECT_SPIT_UP + .byte 100 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SWALLOW + .byte EFFECT_SWALLOW + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ HEAT_WAVE + .byte EFFECT_BURN_HIT + .byte 100 @ power + .byte TYPE_FIRE + .byte 90 @ accuracy + .byte 10 @ PP + .byte 10 @ secondary effect chance + .byte F_TARGET_BOTH_ENEMIES + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ HAIL + .byte EFFECT_HAIL + .byte 0 @ power + .byte TYPE_ICE + .byte 0 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_PROTECT @ misc. flags + +@ TORMENT + .byte EFFECT_TORMENT + .byte 0 @ power + .byte TYPE_DARK + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ FLATTER + .byte EFFECT_FLATTER + .byte 0 @ power + .byte TYPE_DARK + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ WILL_O_WISP + .byte EFFECT_WILL_O_WISP + .byte 0 @ power + .byte TYPE_FIRE + .byte 75 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ MEMENTO + .byte EFFECT_MEMENTO + .byte 0 @ power + .byte TYPE_DARK + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ FACADE + .byte EFFECT_FACADE + .byte 70 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ FOCUS_PUNCH + .byte EFFECT_FOCUS_PUNCH + .byte 150 @ power + .byte TYPE_FIGHTING + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte -3 @ priority + .4byte F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SMELLING_SALT + .byte EFFECT_SMELLINGSALT + .byte 60 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ FOLLOW_ME + .byte EFFECT_FOLLOW_ME + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 3 @ priority + .4byte 0 @ misc. flags + +@ NATURE_POWER + .byte EFFECT_NATURE_POWER + .byte 0 @ power + .byte TYPE_NORMAL + .byte 95 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_SPECIAL + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ CHARGE + .byte EFFECT_CHARGE + .byte 0 @ power + .byte TYPE_ELECTRIC + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ TAUNT + .byte EFFECT_TAUNT + .byte 0 @ power + .byte TYPE_DARK + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_PROTECT @ misc. flags + +@ HELPING_HAND + .byte EFFECT_HELPING_HAND + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 5 @ priority + .4byte 0 @ misc. flags + +@ TRICK + .byte EFFECT_TRICK + .byte 0 @ power + .byte TYPE_PSYCHIC + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ ROLE_PLAY + .byte EFFECT_ROLE_PLAY + .byte 0 @ power + .byte TYPE_PSYCHIC + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ WISH + .byte EFFECT_WISH + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_PROTECT @ misc. flags + +@ ASSIST + .byte EFFECT_ASSIST + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_SPECIAL + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ INGRAIN + .byte EFFECT_INGRAIN + .byte 0 @ power + .byte TYPE_GRASS + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ SUPERPOWER + .byte EFFECT_SUPERPOWER + .byte 120 @ power + .byte TYPE_FIGHTING + .byte 100 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ MAGIC_COAT + .byte EFFECT_MAGIC_COAT + .byte 0 @ power + .byte TYPE_PSYCHIC + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_SPECIAL + .byte 4 @ priority + .4byte 0 @ misc. flags + +@ RECYCLE + .byte EFFECT_RECYCLE + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ REVENGE + .byte EFFECT_REVENGE + .byte 60 @ power + .byte TYPE_FIGHTING + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte -4 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ BRICK_BREAK + .byte EFFECT_BRICK_BREAK + .byte 75 @ power + .byte TYPE_FIGHTING + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ YAWN + .byte EFFECT_YAWN + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ KNOCK_OFF + .byte EFFECT_KNOCK_OFF + .byte 20 @ power + .byte TYPE_DARK + .byte 100 @ accuracy + .byte 20 @ PP + .byte 100 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ ENDEAVOR + .byte EFFECT_ENDEAVOR + .byte 1 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ ERUPTION + .byte EFFECT_ERUPTION + .byte 150 @ power + .byte TYPE_FIRE + .byte 100 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_BOTH_ENEMIES + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SKILL_SWAP + .byte EFFECT_SKILL_SWAP + .byte 0 @ power + .byte TYPE_PSYCHIC + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ IMPRISON + .byte EFFECT_IMPRISON + .byte 0 @ power + .byte TYPE_PSYCHIC + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_PROTECT @ misc. flags + +@ REFRESH + .byte EFFECT_REFRESH + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ GRUDGE + .byte EFFECT_GRUDGE + .byte 0 @ power + .byte TYPE_GHOST + .byte 100 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SNATCH + .byte EFFECT_SNATCH + .byte 0 @ power + .byte TYPE_DARK + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_SPECIAL + .byte 4 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE @ misc. flags + +@ SECRET_POWER + .byte EFFECT_SECRET_POWER + .byte 70 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 20 @ PP + .byte 30 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ DIVE + .byte EFFECT_FLY + .byte 60 @ power + .byte TYPE_WATER + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ ARM_THRUST + .byte EFFECT_MULTI_HIT + .byte 15 @ power + .byte TYPE_FIGHTING + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ CAMOUFLAGE + .byte EFFECT_CAMOUFLAGE + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ TAIL_GLOW + .byte EFFECT_SPECIAL_ATTACK_UP_2 + .byte 0 @ power + .byte TYPE_BUG + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ LUSTER_PURGE + .byte EFFECT_SPECIAL_DEFENSE_DOWN_HIT + .byte 70 @ power + .byte TYPE_PSYCHIC + .byte 100 @ accuracy + .byte 5 @ PP + .byte 50 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ MIST_BALL + .byte EFFECT_SPECIAL_ATTACK_DOWN_HIT + .byte 70 @ power + .byte TYPE_PSYCHIC + .byte 100 @ accuracy + .byte 5 @ PP + .byte 50 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ FEATHER_DANCE + .byte EFFECT_ATTACK_DOWN_2 + .byte 0 @ power + .byte TYPE_FLYING + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ TEETER_DANCE + .byte EFFECT_TEETER_DANCE + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_ALL_EXCEPT_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_PROTECT @ misc. flags + +@ BLAZE_KICK + .byte EFFECT_BLAZE_KICK + .byte 85 @ power + .byte TYPE_FIRE + .byte 90 @ accuracy + .byte 10 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ MUD_SPORT + .byte EFFECT_MUD_SPORT + .byte 0 @ power + .byte TYPE_GROUND + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ ICE_BALL + .byte EFFECT_ROLLOUT + .byte 30 @ power + .byte TYPE_ICE + .byte 90 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ NEEDLE_ARM + .byte EFFECT_FLINCH_HIT_2 + .byte 60 @ power + .byte TYPE_GRASS + .byte 100 @ accuracy + .byte 15 @ PP + .byte 30 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SLACK_OFF + .byte EFFECT_RESTORE_HP + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ HYPER_VOICE + .byte EFFECT_HIT + .byte 90 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_BOTH_ENEMIES + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ POISON_FANG + .byte EFFECT_POISON_FANG + .byte 50 @ power + .byte TYPE_POISON + .byte 100 @ accuracy + .byte 15 @ PP + .byte 30 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ CRUSH_CLAW + .byte EFFECT_DEFENSE_DOWN_HIT + .byte 75 @ power + .byte TYPE_NORMAL + .byte 95 @ accuracy + .byte 10 @ PP + .byte 50 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ BLAST_BURN + .byte EFFECT_RECHARGE + .byte 150 @ power + .byte TYPE_FIRE + .byte 90 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ HYDRO_CANNON + .byte EFFECT_RECHARGE + .byte 150 @ power + .byte TYPE_WATER + .byte 90 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ METEOR_MASH + .byte EFFECT_ATTACK_UP_HIT + .byte 100 @ power + .byte TYPE_STEEL + .byte 85 @ accuracy + .byte 10 @ PP + .byte 20 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ ASTONISH + .byte EFFECT_FLINCH_HIT_2 + .byte 30 @ power + .byte TYPE_GHOST + .byte 100 @ accuracy + .byte 15 @ PP + .byte 30 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ WEATHER_BALL + .byte EFFECT_WEATHER_BALL + .byte 50 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ AROMATHERAPY + .byte EFFECT_HEAL_BELL + .byte 0 @ power + .byte TYPE_GRASS + .byte 0 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ FAKE_TEARS + .byte EFFECT_SPECIAL_DEFENSE_DOWN_2 + .byte 0 @ power + .byte TYPE_DARK + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ AIR_CUTTER + .byte EFFECT_HIGH_CRITICAL + .byte 55 @ power + .byte TYPE_FLYING + .byte 95 @ accuracy + .byte 25 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_BOTH_ENEMIES + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ OVERHEAT + .byte EFFECT_OVERHEAT + .byte 140 @ power + .byte TYPE_FIRE + .byte 90 @ accuracy + .byte 5 @ PP + .byte 100 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ ODOR_SLEUTH + .byte EFFECT_FORESIGHT + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 40 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ ROCK_TOMB + .byte EFFECT_SPEED_DOWN_HIT + .byte 50 @ power + .byte TYPE_ROCK + .byte 80 @ accuracy + .byte 10 @ PP + .byte 100 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SILVER_WIND + .byte EFFECT_ALL_STATS_UP_HIT + .byte 60 @ power + .byte TYPE_BUG + .byte 100 @ accuracy + .byte 5 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ METAL_SOUND + .byte EFFECT_SPECIAL_DEFENSE_DOWN_2 + .byte 0 @ power + .byte TYPE_STEEL + .byte 85 @ accuracy + .byte 40 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ GRASS_WHISTLE + .byte EFFECT_SLEEP + .byte 0 @ power + .byte TYPE_GRASS + .byte 55 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ TICKLE + .byte EFFECT_TICKLE + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ COSMIC_POWER + .byte EFFECT_COSMIC_POWER + .byte 0 @ power + .byte TYPE_PSYCHIC + .byte 0 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ WATER_SPOUT + .byte EFFECT_ERUPTION + .byte 150 @ power + .byte TYPE_WATER + .byte 100 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_BOTH_ENEMIES + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SIGNAL_BEAM + .byte EFFECT_CONFUSE_HIT + .byte 75 @ power + .byte TYPE_BUG + .byte 100 @ accuracy + .byte 15 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SHADOW_PUNCH + .byte EFFECT_ALWAYS_HIT + .byte 60 @ power + .byte TYPE_GHOST + .byte 0 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ EXTRASENSORY + .byte EFFECT_FLINCH_HIT_2 + .byte 80 @ power + .byte TYPE_PSYCHIC + .byte 100 @ accuracy + .byte 30 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SKY_UPPERCUT + .byte EFFECT_SKY_UPPERCUT + .byte 85 @ power + .byte TYPE_FIGHTING + .byte 90 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ SAND_TOMB + .byte EFFECT_TRAP + .byte 15 @ power + .byte TYPE_GROUND + .byte 70 @ accuracy + .byte 15 @ PP + .byte 100 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SHEER_COLD + .byte EFFECT_OHKO + .byte 1 @ power + .byte TYPE_ICE + .byte 30 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ MUDDY_WATER + .byte EFFECT_ACCURACY_DOWN_HIT + .byte 95 @ power + .byte TYPE_WATER + .byte 85 @ accuracy + .byte 10 @ PP + .byte 30 @ secondary effect chance + .byte F_TARGET_BOTH_ENEMIES + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ BULLET_SEED + .byte EFFECT_MULTI_HIT + .byte 10 @ power + .byte TYPE_GRASS + .byte 100 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ AERIAL_ACE + .byte EFFECT_ALWAYS_HIT + .byte 60 @ power + .byte TYPE_FLYING + .byte 0 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ ICICLE_SPEAR + .byte EFFECT_MULTI_HIT + .byte 10 @ power + .byte TYPE_ICE + .byte 100 @ accuracy + .byte 30 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ IRON_DEFENSE + .byte EFFECT_DEFENSE_UP_2 + .byte 0 @ power + .byte TYPE_STEEL + .byte 0 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ BLOCK + .byte EFFECT_MEAN_LOOK + .byte 0 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags + +@ HOWL + .byte EFFECT_ATTACK_UP + .byte 0 @ power + .byte TYPE_NORMAL + .byte 0 @ accuracy + .byte 40 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ DRAGON_CLAW + .byte EFFECT_HIT + .byte 80 @ power + .byte TYPE_DRAGON + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ FRENZY_PLANT + .byte EFFECT_RECHARGE + .byte 150 @ power + .byte TYPE_GRASS + .byte 90 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ BULK_UP + .byte EFFECT_BULK_UP + .byte 0 @ power + .byte TYPE_FIGHTING + .byte 0 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ BOUNCE + .byte EFFECT_FLY + .byte 85 @ power + .byte TYPE_FLYING + .byte 85 @ accuracy + .byte 5 @ PP + .byte 30 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ MUD_SHOT + .byte EFFECT_SPEED_DOWN_HIT + .byte 55 @ power + .byte TYPE_GROUND + .byte 95 @ accuracy + .byte 15 @ PP + .byte 100 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ POISON_TAIL + .byte EFFECT_POISON_TAIL + .byte 50 @ power + .byte TYPE_POISON + .byte 100 @ accuracy + .byte 25 @ PP + .byte 10 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ COVET + .byte EFFECT_THIEF + .byte 40 @ power + .byte TYPE_NORMAL + .byte 100 @ accuracy + .byte 40 @ PP + .byte 100 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ VOLT_TACKLE + .byte EFFECT_DOUBLE_EDGE + .byte 120 @ power + .byte TYPE_ELECTRIC + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ MAGICAL_LEAF + .byte EFFECT_ALWAYS_HIT + .byte 60 @ power + .byte TYPE_GRASS + .byte 0 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ WATER_SPORT + .byte EFFECT_WATER_SPORT + .byte 0 @ power + .byte TYPE_WATER + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ CALM_MIND + .byte EFFECT_CALM_MIND + .byte 0 @ power + .byte TYPE_PSYCHIC + .byte 0 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ LEAF_BLADE + .byte EFFECT_HIGH_CRITICAL + .byte 70 @ power + .byte TYPE_GRASS + .byte 100 @ accuracy + .byte 15 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags + +@ DRAGON_DANCE + .byte EFFECT_DRAGON_DANCE + .byte 0 @ power + .byte TYPE_DRAGON + .byte 0 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte F_TARGET_USER + .byte 0 @ priority + .4byte F_AFFECTED_BY_SNATCH @ misc. flags + +@ ROCK_BLAST + .byte EFFECT_MULTI_HIT + .byte 25 @ power + .byte TYPE_ROCK + .byte 80 @ accuracy + .byte 10 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ SHOCK_WAVE + .byte EFFECT_ALWAYS_HIT + .byte 60 @ power + .byte TYPE_ELECTRIC + .byte 0 @ accuracy + .byte 20 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ WATER_PULSE + .byte EFFECT_CONFUSE_HIT + .byte 60 @ power + .byte TYPE_WATER + .byte 100 @ accuracy + .byte 20 @ PP + .byte 20 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags + +@ DOOM_DESIRE + .byte EFFECT_FUTURE_SIGHT + .byte 120 @ power + .byte TYPE_STEEL + .byte 85 @ accuracy + .byte 5 @ PP + .byte 0 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte 0 @ misc. flags + +@ PSYCHO_BOOST + .byte EFFECT_OVERHEAT + .byte 140 @ power + .byte TYPE_PSYCHIC + .byte 90 @ accuracy + .byte 5 @ PP + .byte 100 @ secondary effect chance + .byte TARGET_SELECTED_POKEMON + .byte 0 @ priority + .4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags diff --git a/data/data2c.s b/data/data2c.s deleted file mode 100644 index 260b451cf..000000000 --- a/data/data2c.s +++ /dev/null @@ -1,10 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - - -@ 81FB12C - .include "data/battle_moves.inc" - -- cgit v1.2.3 From c6e0f8cfd74c83165838e227efba27a8f9166133 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 28 Aug 2017 21:09:02 +0200 Subject: start decomp of pokemon menu --- data/pokemon_menu.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/pokemon_menu.s b/data/pokemon_menu.s index 9e2ce2864..477b33a4a 100644 --- a/data/pokemon_menu.s +++ b/data/pokemon_menu.s @@ -4,7 +4,7 @@ .section .rodata .align 2 -gPokemonMenuActions:: @ 839F494 +sPokemonMenuActions:: @ 839F494 .4byte OtherText_Summary, PokemonMenu_Summary .4byte OtherText_Switch2, PokemonMenu_Switch .4byte OtherText_Item, PokemonMenu_Item @@ -31,7 +31,7 @@ gPokemonMenuActions:: @ 839F494 .4byte gMoveNames + 13 * MOVE_SWEET_SCENT, PokemonMenu_FieldMove .align 1 -gUnknown_0839F554:: @ 839F554 +sPokeMenuFieldMoves:: @ 839F554 .2byte MOVE_CUT .2byte MOVE_FLASH .2byte MOVE_ROCK_SMASH -- cgit v1.2.3 From 2bc843ccbbf3baa9b69e544e4f23e1d02b597fd8 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 28 Aug 2017 21:41:57 -0500 Subject: clean up mauville man script --- data/scripts/mauville_man.inc | 52 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 10 deletions(-) (limited to 'data') diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 159d729f6..997b5a31c 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -10,18 +10,19 @@ MAUVILLE_MAN_GIDDY = 4 MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744 special ScrSpecial_GetCurrentMauvilleMan switch RESULT - case MAUVILLE_MAN_BARD, speak_to_bard - case MAUVILLE_MAN_HIPSTER, speak_to_hipster - case MAUVILLE_MAN_TRADER, speak_to_trader - case MAUVILLE_MAN_STORYTELLER, speak_to_storyteller - case MAUVILLE_MAN_GIDDY, speak_to_giddy + case MAUVILLE_MAN_BARD, SpeakToBard + case MAUVILLE_MAN_HIPSTER, SpeakToHipster + case MAUVILLE_MAN_TRADER, SpeakToTrader + case MAUVILLE_MAN_STORYTELLER, SpeakToStoryteller + case MAUVILLE_MAN_GIDDY, SpeakToGiddy end + @------------------------------------------------------------------------------- @ Bard @------------------------------------------------------------------------------- -speak_to_bard: +SpeakToBard: lock faceplayer msgbox gTextBard_HiImTheBard, MSGBOX_YESNO @@ -30,6 +31,7 @@ speak_to_bard: compare RESULT, NO jumpeq dont_hear_song end + yes_hear_song: setvar 0x8004, 0 @ Give the player ear rape @@ -42,10 +44,12 @@ yes_hear_song: msgbox gTextBard_OhWhatAMovingSong, 4 release end + dont_hear_song: msgbox gTextBard_OhYouveLeftMe, 4 release end + prompt_write_lyrics: msgbox gTextBard_SoHowDoYouLikeMySong, MSGBOX_YESNO compare RESULT, YES @@ -53,6 +57,7 @@ prompt_write_lyrics: compare RESULT, NO jumpeq dont_write_lyrics end + write_lyrics: setvar 0x8004, 6 call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3 @@ -72,16 +77,18 @@ write_lyrics: msgbox gTextBard_OkayThatsIt, 4 release end + dont_write_lyrics: msgbox gTextBard_OhYouveLeftMe2, 4 release end + @------------------------------------------------------------------------------- @ Hipster @------------------------------------------------------------------------------- -speak_to_hipster: +SpeakToHipster: lock faceplayer setflag 2054 @@ -92,6 +99,7 @@ speak_to_hipster: msgbox gTextHipster_TaughtYouAlready, 4 release end + hipster_first_time: special ScrSpecial_HipsterTeachWord compare RESULT, TRUE @ TRUE if player learned a new word @@ -99,19 +107,21 @@ hipster_first_time: msgbox gTextHipster_YouAlreadyKnowALot, 4 release end + teach_new_word: msgbox gTextHipster_HaveYouHeardAbout, 4 special ScrSpecial_SetHipsterSpokenFlag release end + @------------------------------------------------------------------------------- @ Trader @------------------------------------------------------------------------------- .include "data/text/trader.inc" -speak_to_trader: +SpeakToTrader: lock faceplayer msgbox gTextTrader_Introduction, MSGBOX_YESNO @@ -124,12 +134,15 @@ speak_to_trader: waittext jump do_trader_menu_get end + dont_want_to_trade: msgbox gTextTrader_FeelUnwanted1, 2 end + already_traded: msgbox gTextTrader_TradedAlready, 2 end + do_trader_menu_get: special ScrSpecial_TraderMenuGetDecoration waitstate @@ -145,22 +158,27 @@ do_trader_menu_get: jumpeq player_has_no_decorations jump do_trader_menu_give end + cancelled_get_menu: msgbox gTextTrader_DontWantAnything, 2 end + rare_item_cant_trade_away: message gTextTrader_ICantTradeThatOneAway waittext jump do_trader_menu_get end + dont_want_item: message gTextTrader_MenuPrompt waittext jump do_trader_menu_get end + player_has_no_decorations: msgbox gTextTrader_YouDontHaveDecorations, 2 end + do_trader_menu_give: msgbox gTextTrader_PickDecorationYoullTrade, 4 special ScrSpecial_TraderMenuGiveDecoration @@ -178,24 +196,28 @@ do_trader_menu_give: special ScrSpecial_TraderDoDecorationTrade msgbox gTextTrader_ThenWellTrade, 2 end + cancelled_give_menu: msgbox gTextTrader_FeelUnwanted2, 2 end + decoration_is_in_use: msgbox gTextTrader_InUseYouCantTradeIt, 4 jump do_trader_menu_give end + decorations_full: msgbox gTextTrader_NoRoomForThis, 2 end + @------------------------------------------------------------------------------- @ Storyteller @------------------------------------------------------------------------------- .include "data/text/storyteller.inc" -speak_to_storyteller: +SpeakToStoryteller: setvar 0x8008, 0 setvar 0x8009, 0 setvar 0x800a, 0 @@ -253,29 +275,33 @@ prompt_record_story: closebutton release end + stat_update: msgbox gTextStoryteller_BirthOfANewLegend, 4 closebutton release end + dont_hear_story: msgbox gTextStoryteller_OhIFeelStifled, 4 closebutton release end + cant_record_story: msgbox gTextStoryteller_WishMorePeopleWould, 4 closebutton release end + @------------------------------------------------------------------------------- @ Giddy @------------------------------------------------------------------------------- .include "data/text/giddy.inc" -speak_to_giddy: +SpeakToGiddy: lock faceplayer msgbox gTextGiddy_Introduction, MSGBOX_YESNO @@ -284,6 +310,7 @@ speak_to_giddy: compare RESULT, NO jumpeq dont_hear_giddy end + yes_hear_giddy: special ScrSpecial_GiddyShouldTellAnotherTale compare RESULT, TRUE @@ -291,6 +318,7 @@ yes_hear_giddy: compare RESULT, FALSE jumpeq bye_bye end + tell_another_giddy_tale: special ScrSpecial_GiddyShouldTellAnotherTale compare RESULT, TRUE @@ -298,10 +326,12 @@ tell_another_giddy_tale: compare RESULT, FALSE jumpeq bye_bye end + also_i_was_thinking: msgbox gTextGiddy_AlsoIWasThinking, 4 jump tell_giddy_tale end + tell_giddy_tale: special ScrSpecial_GenerateGiddyLine special ShowFieldMessageStringVar4 @@ -312,10 +342,12 @@ tell_giddy_tale: compare RESULT, 0 jumpeq tell_another_giddy_tale end + dont_hear_giddy: msgbox gTextGiddy_YouveDeflatedMe, 4 release end + bye_bye: msgbox gTextGiddy_ByeBye, 4 release -- cgit v1.2.3 From 0e382fbe2c5ed74708235737746420ab88a1e78f Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 29 Aug 2017 23:18:35 +0200 Subject: decompile pokemon_menu --- data/pokemon_menu.s | 82 ----------------------------------------------------- 1 file changed, 82 deletions(-) delete mode 100644 data/pokemon_menu.s (limited to 'data') diff --git a/data/pokemon_menu.s b/data/pokemon_menu.s deleted file mode 100644 index 477b33a4a..000000000 --- a/data/pokemon_menu.s +++ /dev/null @@ -1,82 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -sPokemonMenuActions:: @ 839F494 - .4byte OtherText_Summary, PokemonMenu_Summary - .4byte OtherText_Switch2, PokemonMenu_Switch - .4byte OtherText_Item, PokemonMenu_Item - .4byte gOtherText_CancelNoTerminator, PokemonMenu_Cancel - .4byte OtherText_Give2, PokemonMenu_GiveItem - .4byte OtherText_Take2, PokemonMenu_TakeItem - .4byte OtherText_Take, PokemonMenu_TakeMail - .4byte OtherText_Mail, PokemonMenu_Mail - .4byte OtherText_Read2, PokemonMenu_ReadMail - .4byte gOtherText_CancelNoTerminator, PokemonMenu_CancelSubmenu - .4byte gMoveNames + 13 * MOVE_CUT, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_FLASH, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_ROCK_SMASH, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_STRENGTH, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_SURF, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_FLY, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_DIVE, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_WATERFALL, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_TELEPORT, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_DIG, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_SECRET_POWER, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_MILK_DRINK, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_SOFT_BOILED, PokemonMenu_FieldMove - .4byte gMoveNames + 13 * MOVE_SWEET_SCENT, PokemonMenu_FieldMove - - .align 1 -sPokeMenuFieldMoves:: @ 839F554 - .2byte MOVE_CUT - .2byte MOVE_FLASH - .2byte MOVE_ROCK_SMASH - .2byte MOVE_STRENGTH - .2byte MOVE_SURF - .2byte MOVE_FLY - .2byte MOVE_DIVE - .2byte MOVE_WATERFALL - .2byte MOVE_TELEPORT - .2byte MOVE_DIG - .2byte MOVE_SECRET_POWER - .2byte MOVE_MILK_DRINK - .2byte MOVE_SOFT_BOILED - .2byte MOVE_SWEET_SCENT - .2byte 0xFF - -Unknown_39F572: @ 839F572 - .byte 4, 5, 9, 0 - - .align 2 -gUnknown_0839F578:: @ 839F578 - .byte 3, 6, 0, 0 - .4byte Unknown_39F572 - -Unknown_39F580: @ 839F580 - .byte 8, 6, 9, 0 - - .align 2 -gUnknown_0839F584:: @ 839F584 - .byte 3, 9, 0, 0 - .4byte Unknown_39F580 - - .align 2 -gFieldMoveFuncs:: @ 839F58C - .4byte SetUpFieldMove_Cut, 0x6 - .4byte SetUpFieldMove_Flash, 0x9 - .4byte SetUpFieldMove_RockSmash, 0x9 - .4byte SetUpFieldMove_Strength, 0x9 - .4byte SetUpFieldMove_Surf, 0x7 - .4byte SetUpFieldMove_Fly, 0x9 - .4byte SetUpFieldMove_Dive, 0x9 - .4byte SetUpFieldMove_Waterfall, 0x9 - .4byte SetUpFieldMove_Teleport, 0x9 - .4byte SetUpFieldMove_Dig, 0x9 - .4byte SetUpFieldMove_SecretPower, 0x9 - .4byte SetUpFieldMove_SoftBoiled, 0x10 - .4byte SetUpFieldMove_SoftBoiled, 0x10 - .4byte SetUpFieldMove_SweetScent, 0x9 -- cgit v1.2.3 From 7755869cd2b521cb0a608f5f71c8a272e81cb214 Mon Sep 17 00:00:00 2001 From: scnorton Date: Wed, 30 Aug 2017 09:43:48 -0400 Subject: Convert egg moves and daycare strings/pointers to C objects --- data/daycare.s | 17 - data/egg_moves.inc | 1306 ---------------------------------------------------- 2 files changed, 1323 deletions(-) delete mode 100644 data/daycare.s delete mode 100644 data/egg_moves.inc (limited to 'data') diff --git a/data/daycare.s b/data/daycare.s deleted file mode 100644 index 92eb4637e..000000000 --- a/data/daycare.s +++ /dev/null @@ -1,17 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -@ 82091DC - .include "data/egg_moves.inc" - - .align 2 -gUnknown_08209AC4:: @ 8209AC4 - .4byte DaycareText_GetAlongVeryWell - .4byte DaycareText_GetAlong - .4byte DaycareText_DontLikeOther - .4byte DaycareText_PlayOther - -gUnknown_08209AD4:: @ 8209AD4 - .string "タマゴ$" diff --git a/data/egg_moves.inc b/data/egg_moves.inc deleted file mode 100644 index e684e04ce..000000000 --- a/data/egg_moves.inc +++ /dev/null @@ -1,1306 +0,0 @@ - .align 2 -gEggMoves:: @ 82091DC - egg_moves_begin SPECIES_BULBASAUR - .2byte MOVE_LIGHT_SCREEN - .2byte MOVE_SKULL_BASH - .2byte MOVE_SAFEGUARD - .2byte MOVE_CHARM - .2byte MOVE_PETAL_DANCE - .2byte MOVE_MAGICAL_LEAF - .2byte MOVE_GRASS_WHISTLE - .2byte MOVE_CURSE - - egg_moves_begin SPECIES_CHARMANDER - .2byte MOVE_BELLY_DRUM - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_BITE - .2byte MOVE_OUTRAGE - .2byte MOVE_BEAT_UP - .2byte MOVE_SWORDS_DANCE - .2byte MOVE_DRAGON_DANCE - - egg_moves_begin SPECIES_SQUIRTLE - .2byte MOVE_MIRROR_COAT - .2byte MOVE_HAZE - .2byte MOVE_MIST - .2byte MOVE_FORESIGHT - .2byte MOVE_FLAIL - .2byte MOVE_REFRESH - .2byte MOVE_MUD_SPORT - .2byte MOVE_YAWN - - egg_moves_begin SPECIES_PIDGEY - .2byte MOVE_PURSUIT - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_FORESIGHT - .2byte MOVE_STEEL_WING - .2byte MOVE_AIR_CUTTER - - egg_moves_begin SPECIES_RATTATA - .2byte MOVE_SCREECH - .2byte MOVE_FLAME_WHEEL - .2byte MOVE_FURY_SWIPES - .2byte MOVE_BITE - .2byte MOVE_COUNTER - .2byte MOVE_REVERSAL - .2byte MOVE_UPROAR - .2byte MOVE_SWAGGER - - egg_moves_begin SPECIES_SPEAROW - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_FALSE_SWIPE - .2byte MOVE_SCARY_FACE - .2byte MOVE_QUICK_ATTACK - .2byte MOVE_TRI_ATTACK - .2byte MOVE_ASTONISH - .2byte MOVE_SKY_ATTACK - - egg_moves_begin SPECIES_EKANS - .2byte MOVE_PURSUIT - .2byte MOVE_SLAM - .2byte MOVE_SPITE - .2byte MOVE_BEAT_UP - .2byte MOVE_POISON_FANG - - egg_moves_begin SPECIES_SANDSHREW - .2byte MOVE_FLAIL - .2byte MOVE_SAFEGUARD - .2byte MOVE_COUNTER - .2byte MOVE_RAPID_SPIN - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_METAL_CLAW - .2byte MOVE_SWORDS_DANCE - .2byte MOVE_CRUSH_CLAW - - egg_moves_begin SPECIES_NIDORAN_F - .2byte MOVE_SUPERSONIC - .2byte MOVE_DISABLE - .2byte MOVE_TAKE_DOWN - .2byte MOVE_FOCUS_ENERGY - .2byte MOVE_CHARM - .2byte MOVE_COUNTER - .2byte MOVE_BEAT_UP - - egg_moves_begin SPECIES_NIDORAN_M - .2byte MOVE_COUNTER - .2byte MOVE_DISABLE - .2byte MOVE_SUPERSONIC - .2byte MOVE_TAKE_DOWN - .2byte MOVE_AMNESIA - .2byte MOVE_CONFUSION - .2byte MOVE_BEAT_UP - - egg_moves_begin SPECIES_VULPIX - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_HYPNOSIS - .2byte MOVE_FLAIL - .2byte MOVE_SPITE - .2byte MOVE_DISABLE - .2byte MOVE_HOWL - .2byte MOVE_PSYCH_UP - .2byte MOVE_HEAT_WAVE - - egg_moves_begin SPECIES_ZUBAT - .2byte MOVE_QUICK_ATTACK - .2byte MOVE_PURSUIT - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_GUST - .2byte MOVE_WHIRLWIND - .2byte MOVE_CURSE - - egg_moves_begin SPECIES_ODDISH - .2byte MOVE_SWORDS_DANCE - .2byte MOVE_RAZOR_LEAF - .2byte MOVE_FLAIL - .2byte MOVE_SYNTHESIS - .2byte MOVE_CHARM - .2byte MOVE_INGRAIN - - egg_moves_begin SPECIES_PARAS - .2byte MOVE_FALSE_SWIPE - .2byte MOVE_SCREECH - .2byte MOVE_COUNTER - .2byte MOVE_PSYBEAM - .2byte MOVE_FLAIL - .2byte MOVE_SWEET_SCENT - .2byte MOVE_LIGHT_SCREEN - .2byte MOVE_PURSUIT - - egg_moves_begin SPECIES_VENONAT - .2byte MOVE_BATON_PASS - .2byte MOVE_SCREECH - .2byte MOVE_GIGA_DRAIN - .2byte MOVE_SIGNAL_BEAM - - egg_moves_begin SPECIES_DIGLETT - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_SCREECH - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_PURSUIT - .2byte MOVE_BEAT_UP - .2byte MOVE_UPROAR - .2byte MOVE_ROCK_SLIDE - - egg_moves_begin SPECIES_MEOWTH - .2byte MOVE_SPITE - .2byte MOVE_CHARM - .2byte MOVE_HYPNOSIS - .2byte MOVE_AMNESIA - .2byte MOVE_PSYCH_UP - .2byte MOVE_ASSIST - - egg_moves_begin SPECIES_PSYDUCK - .2byte MOVE_HYPNOSIS - .2byte MOVE_PSYBEAM - .2byte MOVE_FORESIGHT - .2byte MOVE_LIGHT_SCREEN - .2byte MOVE_FUTURE_SIGHT - .2byte MOVE_PSYCHIC - .2byte MOVE_CROSS_CHOP - .2byte MOVE_REFRESH - - egg_moves_begin SPECIES_MANKEY - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_FORESIGHT - .2byte MOVE_MEDITATE - .2byte MOVE_COUNTER - .2byte MOVE_REVERSAL - .2byte MOVE_BEAT_UP - .2byte MOVE_REVENGE - .2byte MOVE_SMELLING_SALT - - egg_moves_begin SPECIES_GROWLITHE - .2byte MOVE_BODY_SLAM - .2byte MOVE_SAFEGUARD - .2byte MOVE_CRUNCH - .2byte MOVE_THRASH - .2byte MOVE_FIRE_SPIN - .2byte MOVE_HOWL - .2byte MOVE_HEAT_WAVE - - egg_moves_begin SPECIES_POLIWAG - .2byte MOVE_MIST - .2byte MOVE_SPLASH - .2byte MOVE_BUBBLE_BEAM - .2byte MOVE_HAZE - .2byte MOVE_MIND_READER - .2byte MOVE_WATER_SPORT - .2byte MOVE_ICE_BALL - - egg_moves_begin SPECIES_ABRA - .2byte MOVE_ENCORE - .2byte MOVE_BARRIER - .2byte MOVE_KNOCK_OFF - .2byte MOVE_FIRE_PUNCH - .2byte MOVE_THUNDER_PUNCH - .2byte MOVE_ICE_PUNCH - - egg_moves_begin SPECIES_MACHOP - .2byte MOVE_LIGHT_SCREEN - .2byte MOVE_MEDITATE - .2byte MOVE_ROLLING_KICK - .2byte MOVE_ENCORE - .2byte MOVE_SMELLING_SALT - .2byte MOVE_COUNTER - .2byte MOVE_ROCK_SLIDE - - egg_moves_begin SPECIES_BELLSPROUT - .2byte MOVE_SWORDS_DANCE - .2byte MOVE_ENCORE - .2byte MOVE_REFLECT - .2byte MOVE_SYNTHESIS - .2byte MOVE_LEECH_LIFE - .2byte MOVE_INGRAIN - .2byte MOVE_MAGICAL_LEAF - - egg_moves_begin SPECIES_TENTACOOL - .2byte MOVE_AURORA_BEAM - .2byte MOVE_MIRROR_COAT - .2byte MOVE_RAPID_SPIN - .2byte MOVE_HAZE - .2byte MOVE_SAFEGUARD - .2byte MOVE_CONFUSE_RAY - - egg_moves_begin SPECIES_GEODUDE - .2byte MOVE_MEGA_PUNCH - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_BLOCK - - egg_moves_begin SPECIES_PONYTA - .2byte MOVE_FLAME_WHEEL - .2byte MOVE_THRASH - .2byte MOVE_DOUBLE_KICK - .2byte MOVE_HYPNOSIS - .2byte MOVE_CHARM - .2byte MOVE_DOUBLE_EDGE - - egg_moves_begin SPECIES_SLOWPOKE - .2byte MOVE_SAFEGUARD - .2byte MOVE_BELLY_DRUM - .2byte MOVE_FUTURE_SIGHT - .2byte MOVE_STOMP - .2byte MOVE_MUD_SPORT - .2byte MOVE_SLEEP_TALK - .2byte MOVE_SNORE - - egg_moves_begin SPECIES_FARFETCHD - .2byte MOVE_STEEL_WING - .2byte MOVE_FORESIGHT - .2byte MOVE_MIRROR_MOVE - .2byte MOVE_GUST - .2byte MOVE_QUICK_ATTACK - .2byte MOVE_FLAIL - .2byte MOVE_FEATHER_DANCE - .2byte MOVE_CURSE - - egg_moves_begin SPECIES_DODUO - .2byte MOVE_QUICK_ATTACK - .2byte MOVE_SUPERSONIC - .2byte MOVE_HAZE - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_FLAIL - .2byte MOVE_ENDEAVOR - - egg_moves_begin SPECIES_SEEL - .2byte MOVE_LICK - .2byte MOVE_PERISH_SONG - .2byte MOVE_DISABLE - .2byte MOVE_HORN_DRILL - .2byte MOVE_SLAM - .2byte MOVE_ENCORE - .2byte MOVE_FAKE_OUT - .2byte MOVE_ICICLE_SPEAR - - egg_moves_begin SPECIES_GRIMER - .2byte MOVE_HAZE - .2byte MOVE_MEAN_LOOK - .2byte MOVE_LICK - .2byte MOVE_IMPRISON - .2byte MOVE_CURSE - .2byte MOVE_SHADOW_PUNCH - .2byte MOVE_EXPLOSION - - egg_moves_begin SPECIES_SHELLDER - .2byte MOVE_BUBBLE_BEAM - .2byte MOVE_TAKE_DOWN - .2byte MOVE_BARRIER - .2byte MOVE_RAPID_SPIN - .2byte MOVE_SCREECH - .2byte MOVE_ICICLE_SPEAR - - egg_moves_begin SPECIES_GASTLY - .2byte MOVE_PSYWAVE - .2byte MOVE_PERISH_SONG - .2byte MOVE_HAZE - .2byte MOVE_ASTONISH - .2byte MOVE_WILL_O_WISP - .2byte MOVE_GRUDGE - .2byte MOVE_EXPLOSION - - egg_moves_begin SPECIES_ONIX - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_FLAIL - .2byte MOVE_EXPLOSION - .2byte MOVE_BLOCK - - egg_moves_begin SPECIES_DROWZEE - .2byte MOVE_BARRIER - .2byte MOVE_ASSIST - .2byte MOVE_ROLE_PLAY - .2byte MOVE_FIRE_PUNCH - .2byte MOVE_THUNDER_PUNCH - .2byte MOVE_ICE_PUNCH - - egg_moves_begin SPECIES_KRABBY - .2byte MOVE_DIG - .2byte MOVE_HAZE - .2byte MOVE_AMNESIA - .2byte MOVE_FLAIL - .2byte MOVE_SLAM - .2byte MOVE_KNOCK_OFF - .2byte MOVE_SWORDS_DANCE - - egg_moves_begin SPECIES_EXEGGCUTE - .2byte MOVE_SYNTHESIS - .2byte MOVE_MOONLIGHT - .2byte MOVE_REFLECT - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_PSYCH_UP - .2byte MOVE_INGRAIN - .2byte MOVE_CURSE - - egg_moves_begin SPECIES_CUBONE - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_BELLY_DRUM - .2byte MOVE_SCREECH - .2byte MOVE_SKULL_BASH - .2byte MOVE_PERISH_SONG - .2byte MOVE_SWORDS_DANCE - - egg_moves_begin SPECIES_LICKITUNG - .2byte MOVE_BELLY_DRUM - .2byte MOVE_MAGNITUDE - .2byte MOVE_BODY_SLAM - .2byte MOVE_CURSE - .2byte MOVE_SMELLING_SALT - .2byte MOVE_SLEEP_TALK - .2byte MOVE_SNORE - .2byte MOVE_SUBSTITUTE - - egg_moves_begin SPECIES_KOFFING - .2byte MOVE_SCREECH - .2byte MOVE_PSYWAVE - .2byte MOVE_PSYBEAM - .2byte MOVE_DESTINY_BOND - .2byte MOVE_PAIN_SPLIT - .2byte MOVE_WILL_O_WISP - - egg_moves_begin SPECIES_RHYHORN - .2byte MOVE_CRUNCH - .2byte MOVE_REVERSAL - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_COUNTER - .2byte MOVE_MAGNITUDE - .2byte MOVE_SWORDS_DANCE - .2byte MOVE_CURSE - .2byte MOVE_CRUSH_CLAW - - egg_moves_begin SPECIES_CHANSEY - .2byte MOVE_PRESENT - .2byte MOVE_METRONOME - .2byte MOVE_HEAL_BELL - .2byte MOVE_AROMATHERAPY - .2byte MOVE_SUBSTITUTE - - egg_moves_begin SPECIES_TANGELA - .2byte MOVE_FLAIL - .2byte MOVE_CONFUSION - .2byte MOVE_MEGA_DRAIN - .2byte MOVE_REFLECT - .2byte MOVE_AMNESIA - .2byte MOVE_LEECH_SEED - .2byte MOVE_NATURE_POWER - - egg_moves_begin SPECIES_KANGASKHAN - .2byte MOVE_STOMP - .2byte MOVE_FORESIGHT - .2byte MOVE_FOCUS_ENERGY - .2byte MOVE_SAFEGUARD - .2byte MOVE_DISABLE - .2byte MOVE_COUNTER - .2byte MOVE_CRUSH_CLAW - .2byte MOVE_SUBSTITUTE - - egg_moves_begin SPECIES_HORSEA - .2byte MOVE_FLAIL - .2byte MOVE_AURORA_BEAM - .2byte MOVE_OCTAZOOKA - .2byte MOVE_DISABLE - .2byte MOVE_SPLASH - .2byte MOVE_DRAGON_RAGE - .2byte MOVE_DRAGON_BREATH - - egg_moves_begin SPECIES_GOLDEEN - .2byte MOVE_PSYBEAM - .2byte MOVE_HAZE - .2byte MOVE_HYDRO_PUMP - .2byte MOVE_SLEEP_TALK - .2byte MOVE_MUD_SPORT - - egg_moves_begin SPECIES_MR_MIME - .2byte MOVE_FUTURE_SIGHT - .2byte MOVE_HYPNOSIS - .2byte MOVE_MIMIC - .2byte MOVE_PSYCH_UP - .2byte MOVE_FAKE_OUT - .2byte MOVE_TRICK - - egg_moves_begin SPECIES_SCYTHER - .2byte MOVE_COUNTER - .2byte MOVE_SAFEGUARD - .2byte MOVE_BATON_PASS - .2byte MOVE_RAZOR_WIND - .2byte MOVE_REVERSAL - .2byte MOVE_LIGHT_SCREEN - .2byte MOVE_ENDURE - .2byte MOVE_SILVER_WIND - - egg_moves_begin SPECIES_PINSIR - .2byte MOVE_FURY_ATTACK - .2byte MOVE_FLAIL - .2byte MOVE_FALSE_SWIPE - .2byte MOVE_FAINT_ATTACK - - egg_moves_begin SPECIES_LAPRAS - .2byte MOVE_FORESIGHT - .2byte MOVE_SUBSTITUTE - .2byte MOVE_TICKLE - .2byte MOVE_REFRESH - .2byte MOVE_DRAGON_DANCE - .2byte MOVE_CURSE - .2byte MOVE_SLEEP_TALK - .2byte MOVE_HORN_DRILL - - egg_moves_begin SPECIES_EEVEE - .2byte MOVE_CHARM - .2byte MOVE_FLAIL - .2byte MOVE_ENDURE - .2byte MOVE_CURSE - .2byte MOVE_TICKLE - .2byte MOVE_WISH - - egg_moves_begin SPECIES_OMANYTE - .2byte MOVE_BUBBLE_BEAM - .2byte MOVE_AURORA_BEAM - .2byte MOVE_SLAM - .2byte MOVE_SUPERSONIC - .2byte MOVE_HAZE - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_SPIKES - - egg_moves_begin SPECIES_KABUTO - .2byte MOVE_BUBBLE_BEAM - .2byte MOVE_AURORA_BEAM - .2byte MOVE_RAPID_SPIN - .2byte MOVE_DIG - .2byte MOVE_FLAIL - .2byte MOVE_KNOCK_OFF - .2byte MOVE_CONFUSE_RAY - - egg_moves_begin SPECIES_AERODACTYL - .2byte MOVE_WHIRLWIND - .2byte MOVE_PURSUIT - .2byte MOVE_FORESIGHT - .2byte MOVE_STEEL_WING - .2byte MOVE_DRAGON_BREATH - .2byte MOVE_CURSE - - egg_moves_begin SPECIES_SNORLAX - .2byte MOVE_LICK - .2byte MOVE_CHARM - .2byte MOVE_DOUBLE_EDGE - .2byte MOVE_CURSE - .2byte MOVE_FISSURE - .2byte MOVE_SUBSTITUTE - - egg_moves_begin SPECIES_DRATINI - .2byte MOVE_LIGHT_SCREEN - .2byte MOVE_MIST - .2byte MOVE_HAZE - .2byte MOVE_SUPERSONIC - .2byte MOVE_DRAGON_BREATH - .2byte MOVE_DRAGON_DANCE - - egg_moves_begin SPECIES_CHIKORITA - .2byte MOVE_VINE_WHIP - .2byte MOVE_LEECH_SEED - .2byte MOVE_COUNTER - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_FLAIL - .2byte MOVE_NATURE_POWER - .2byte MOVE_INGRAIN - .2byte MOVE_GRASS_WHISTLE - - egg_moves_begin SPECIES_CYNDAQUIL - .2byte MOVE_FURY_SWIPES - .2byte MOVE_QUICK_ATTACK - .2byte MOVE_REVERSAL - .2byte MOVE_THRASH - .2byte MOVE_FORESIGHT - .2byte MOVE_COVET - .2byte MOVE_HOWL - .2byte MOVE_CRUSH_CLAW - - egg_moves_begin SPECIES_TOTODILE - .2byte MOVE_CRUNCH - .2byte MOVE_THRASH - .2byte MOVE_HYDRO_PUMP - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_MUD_SPORT - .2byte MOVE_WATER_SPORT - .2byte MOVE_DRAGON_CLAW - - egg_moves_begin SPECIES_SENTRET - .2byte MOVE_DOUBLE_EDGE - .2byte MOVE_PURSUIT - .2byte MOVE_SLASH - .2byte MOVE_FOCUS_ENERGY - .2byte MOVE_REVERSAL - .2byte MOVE_SUBSTITUTE - .2byte MOVE_TRICK - .2byte MOVE_ASSIST - - egg_moves_begin SPECIES_HOOTHOOT - .2byte MOVE_MIRROR_MOVE - .2byte MOVE_SUPERSONIC - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_WING_ATTACK - .2byte MOVE_WHIRLWIND - .2byte MOVE_SKY_ATTACK - .2byte MOVE_FEATHER_DANCE - - egg_moves_begin SPECIES_LEDYBA - .2byte MOVE_PSYBEAM - .2byte MOVE_BIDE - .2byte MOVE_SILVER_WIND - - egg_moves_begin SPECIES_SPINARAK - .2byte MOVE_PSYBEAM - .2byte MOVE_DISABLE - .2byte MOVE_SONIC_BOOM - .2byte MOVE_BATON_PASS - .2byte MOVE_PURSUIT - .2byte MOVE_SIGNAL_BEAM - - egg_moves_begin SPECIES_CHINCHOU - .2byte MOVE_FLAIL - .2byte MOVE_SCREECH - .2byte MOVE_AMNESIA - - egg_moves_begin SPECIES_PICHU - .2byte MOVE_REVERSAL - .2byte MOVE_BIDE - .2byte MOVE_PRESENT - .2byte MOVE_ENCORE - .2byte MOVE_DOUBLE_SLAP - .2byte MOVE_WISH - .2byte MOVE_CHARGE - - egg_moves_begin SPECIES_CLEFFA - .2byte MOVE_PRESENT - .2byte MOVE_METRONOME - .2byte MOVE_AMNESIA - .2byte MOVE_BELLY_DRUM - .2byte MOVE_SPLASH - .2byte MOVE_MIMIC - .2byte MOVE_WISH - .2byte MOVE_SUBSTITUTE - - egg_moves_begin SPECIES_IGGLYBUFF - .2byte MOVE_PERISH_SONG - .2byte MOVE_PRESENT - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_WISH - .2byte MOVE_FAKE_TEARS - - egg_moves_begin SPECIES_TOGEPI - .2byte MOVE_PRESENT - .2byte MOVE_MIRROR_MOVE - .2byte MOVE_PECK - .2byte MOVE_FORESIGHT - .2byte MOVE_FUTURE_SIGHT - .2byte MOVE_SUBSTITUTE - .2byte MOVE_PSYCH_UP - - egg_moves_begin SPECIES_NATU - .2byte MOVE_HAZE - .2byte MOVE_DRILL_PECK - .2byte MOVE_QUICK_ATTACK - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_STEEL_WING - .2byte MOVE_PSYCH_UP - .2byte MOVE_FEATHER_DANCE - .2byte MOVE_REFRESH - - egg_moves_begin SPECIES_MAREEP - .2byte MOVE_TAKE_DOWN - .2byte MOVE_BODY_SLAM - .2byte MOVE_SAFEGUARD - .2byte MOVE_SCREECH - .2byte MOVE_REFLECT - .2byte MOVE_ODOR_SLEUTH - .2byte MOVE_CHARGE - - egg_moves_begin SPECIES_MARILL - .2byte MOVE_LIGHT_SCREEN - .2byte MOVE_PRESENT - .2byte MOVE_AMNESIA - .2byte MOVE_FUTURE_SIGHT - .2byte MOVE_BELLY_DRUM - .2byte MOVE_PERISH_SONG - .2byte MOVE_SUPERSONIC - .2byte MOVE_SUBSTITUTE - - egg_moves_begin SPECIES_SUDOWOODO - .2byte MOVE_SELF_DESTRUCT - - egg_moves_begin SPECIES_HOPPIP - .2byte MOVE_CONFUSION - .2byte MOVE_ENCORE - .2byte MOVE_DOUBLE_EDGE - .2byte MOVE_REFLECT - .2byte MOVE_AMNESIA - .2byte MOVE_HELPING_HAND - .2byte MOVE_PSYCH_UP - - egg_moves_begin SPECIES_AIPOM - .2byte MOVE_COUNTER - .2byte MOVE_SCREECH - .2byte MOVE_PURSUIT - .2byte MOVE_AGILITY - .2byte MOVE_SPITE - .2byte MOVE_SLAM - .2byte MOVE_DOUBLE_SLAP - .2byte MOVE_BEAT_UP - - egg_moves_begin SPECIES_SUNKERN - .2byte MOVE_GRASS_WHISTLE - .2byte MOVE_ENCORE - .2byte MOVE_LEECH_SEED - .2byte MOVE_NATURE_POWER - .2byte MOVE_CURSE - .2byte MOVE_HELPING_HAND - - egg_moves_begin SPECIES_YANMA - .2byte MOVE_WHIRLWIND - .2byte MOVE_REVERSAL - .2byte MOVE_LEECH_LIFE - .2byte MOVE_SIGNAL_BEAM - .2byte MOVE_SILVER_WIND - - egg_moves_begin SPECIES_WOOPER - .2byte MOVE_BODY_SLAM - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_SAFEGUARD - .2byte MOVE_CURSE - .2byte MOVE_MUD_SPORT - .2byte MOVE_STOCKPILE - .2byte MOVE_SWALLOW - .2byte MOVE_SPIT_UP - - egg_moves_begin SPECIES_MURKROW - .2byte MOVE_WHIRLWIND - .2byte MOVE_DRILL_PECK - .2byte MOVE_MIRROR_MOVE - .2byte MOVE_WING_ATTACK - .2byte MOVE_SKY_ATTACK - .2byte MOVE_CONFUSE_RAY - .2byte MOVE_FEATHER_DANCE - .2byte MOVE_PERISH_SONG - - egg_moves_begin SPECIES_MISDREAVUS - .2byte MOVE_SCREECH - .2byte MOVE_DESTINY_BOND - .2byte MOVE_PSYCH_UP - .2byte MOVE_IMPRISON - - egg_moves_begin SPECIES_GIRAFARIG - .2byte MOVE_TAKE_DOWN - .2byte MOVE_AMNESIA - .2byte MOVE_FORESIGHT - .2byte MOVE_FUTURE_SIGHT - .2byte MOVE_BEAT_UP - .2byte MOVE_PSYCH_UP - .2byte MOVE_WISH - .2byte MOVE_MAGIC_COAT - - egg_moves_begin SPECIES_PINECO - .2byte MOVE_REFLECT - .2byte MOVE_PIN_MISSILE - .2byte MOVE_FLAIL - .2byte MOVE_SWIFT - .2byte MOVE_COUNTER - .2byte MOVE_SAND_TOMB - - egg_moves_begin SPECIES_DUNSPARCE - .2byte MOVE_BIDE - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_BITE - .2byte MOVE_HEADBUTT - .2byte MOVE_ASTONISH - .2byte MOVE_CURSE - - egg_moves_begin SPECIES_GLIGAR - .2byte MOVE_METAL_CLAW - .2byte MOVE_WING_ATTACK - .2byte MOVE_RAZOR_WIND - .2byte MOVE_COUNTER - .2byte MOVE_SAND_TOMB - - egg_moves_begin SPECIES_SNUBBULL - .2byte MOVE_METRONOME - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_REFLECT - .2byte MOVE_PRESENT - .2byte MOVE_CRUNCH - .2byte MOVE_HEAL_BELL - .2byte MOVE_SNORE - .2byte MOVE_SMELLING_SALT - - egg_moves_begin SPECIES_QWILFISH - .2byte MOVE_FLAIL - .2byte MOVE_HAZE - .2byte MOVE_BUBBLE_BEAM - .2byte MOVE_SUPERSONIC - .2byte MOVE_ASTONISH - - egg_moves_begin SPECIES_SHUCKLE - .2byte MOVE_SWEET_SCENT - - egg_moves_begin SPECIES_HERACROSS - .2byte MOVE_HARDEN - .2byte MOVE_BIDE - .2byte MOVE_FLAIL - .2byte MOVE_FALSE_SWIPE - - egg_moves_begin SPECIES_SNEASEL - .2byte MOVE_COUNTER - .2byte MOVE_SPITE - .2byte MOVE_FORESIGHT - .2byte MOVE_REFLECT - .2byte MOVE_BITE - .2byte MOVE_CRUSH_CLAW - .2byte MOVE_FAKE_OUT - - egg_moves_begin SPECIES_TEDDIURSA - .2byte MOVE_CRUNCH - .2byte MOVE_TAKE_DOWN - .2byte MOVE_SEISMIC_TOSS - .2byte MOVE_COUNTER - .2byte MOVE_METAL_CLAW - .2byte MOVE_FAKE_TEARS - .2byte MOVE_YAWN - .2byte MOVE_SLEEP_TALK - - egg_moves_begin SPECIES_SLUGMA - .2byte MOVE_ACID_ARMOR - .2byte MOVE_HEAT_WAVE - - egg_moves_begin SPECIES_SWINUB - .2byte MOVE_TAKE_DOWN - .2byte MOVE_BITE - .2byte MOVE_BODY_SLAM - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_MUD_SHOT - .2byte MOVE_ICICLE_SPEAR - .2byte MOVE_DOUBLE_EDGE - - egg_moves_begin SPECIES_CORSOLA - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_SCREECH - .2byte MOVE_MIST - .2byte MOVE_AMNESIA - .2byte MOVE_BARRIER - .2byte MOVE_INGRAIN - .2byte MOVE_CONFUSE_RAY - .2byte MOVE_ICICLE_SPEAR - - egg_moves_begin SPECIES_REMORAID - .2byte MOVE_AURORA_BEAM - .2byte MOVE_OCTAZOOKA - .2byte MOVE_SUPERSONIC - .2byte MOVE_HAZE - .2byte MOVE_SCREECH - .2byte MOVE_THUNDER_WAVE - .2byte MOVE_ROCK_BLAST - - egg_moves_begin SPECIES_DELIBIRD - .2byte MOVE_AURORA_BEAM - .2byte MOVE_QUICK_ATTACK - .2byte MOVE_FUTURE_SIGHT - .2byte MOVE_SPLASH - .2byte MOVE_RAPID_SPIN - .2byte MOVE_ICE_BALL - - egg_moves_begin SPECIES_MANTINE - .2byte MOVE_TWISTER - .2byte MOVE_HYDRO_PUMP - .2byte MOVE_HAZE - .2byte MOVE_SLAM - .2byte MOVE_MUD_SPORT - .2byte MOVE_ROCK_SLIDE - - egg_moves_begin SPECIES_SKARMORY - .2byte MOVE_DRILL_PECK - .2byte MOVE_PURSUIT - .2byte MOVE_WHIRLWIND - .2byte MOVE_SKY_ATTACK - .2byte MOVE_CURSE - - egg_moves_begin SPECIES_HOUNDOUR - .2byte MOVE_FIRE_SPIN - .2byte MOVE_RAGE - .2byte MOVE_PURSUIT - .2byte MOVE_COUNTER - .2byte MOVE_SPITE - .2byte MOVE_REVERSAL - .2byte MOVE_BEAT_UP - .2byte MOVE_WILL_O_WISP - - egg_moves_begin SPECIES_PHANPY - .2byte MOVE_FOCUS_ENERGY - .2byte MOVE_BODY_SLAM - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_SNORE - .2byte MOVE_COUNTER - .2byte MOVE_FISSURE - - egg_moves_begin SPECIES_STANTLER - .2byte MOVE_SPITE - .2byte MOVE_DISABLE - .2byte MOVE_BITE - .2byte MOVE_SWAGGER - .2byte MOVE_PSYCH_UP - .2byte MOVE_EXTRASENSORY - - egg_moves_begin SPECIES_TYROGUE - .2byte MOVE_RAPID_SPIN - .2byte MOVE_HI_JUMP_KICK - .2byte MOVE_MACH_PUNCH - .2byte MOVE_MIND_READER - .2byte MOVE_HELPING_HAND - - egg_moves_begin SPECIES_SMOOCHUM - .2byte MOVE_MEDITATE - .2byte MOVE_PSYCH_UP - .2byte MOVE_FAKE_OUT - .2byte MOVE_WISH - .2byte MOVE_ICE_PUNCH - - egg_moves_begin SPECIES_ELEKID - .2byte MOVE_KARATE_CHOP - .2byte MOVE_BARRIER - .2byte MOVE_ROLLING_KICK - .2byte MOVE_MEDITATE - .2byte MOVE_CROSS_CHOP - .2byte MOVE_FIRE_PUNCH - .2byte MOVE_ICE_PUNCH - - egg_moves_begin SPECIES_MAGBY - .2byte MOVE_KARATE_CHOP - .2byte MOVE_MEGA_PUNCH - .2byte MOVE_BARRIER - .2byte MOVE_SCREECH - .2byte MOVE_CROSS_CHOP - .2byte MOVE_THUNDER_PUNCH - - egg_moves_begin SPECIES_MILTANK - .2byte MOVE_PRESENT - .2byte MOVE_REVERSAL - .2byte MOVE_SEISMIC_TOSS - .2byte MOVE_ENDURE - .2byte MOVE_PSYCH_UP - .2byte MOVE_CURSE - .2byte MOVE_HELPING_HAND - .2byte MOVE_SLEEP_TALK - - egg_moves_begin SPECIES_LARVITAR - .2byte MOVE_PURSUIT - .2byte MOVE_STOMP - .2byte MOVE_OUTRAGE - .2byte MOVE_FOCUS_ENERGY - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_DRAGON_DANCE - .2byte MOVE_CURSE - - egg_moves_begin SPECIES_TREECKO - .2byte MOVE_CRUNCH - .2byte MOVE_MUD_SPORT - .2byte MOVE_ENDEAVOR - .2byte MOVE_LEECH_SEED - .2byte MOVE_DRAGON_BREATH - .2byte MOVE_CRUSH_CLAW - - egg_moves_begin SPECIES_TORCHIC - .2byte MOVE_COUNTER - .2byte MOVE_REVERSAL - .2byte MOVE_ENDURE - .2byte MOVE_SWAGGER - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_SMELLING_SALT - - egg_moves_begin SPECIES_MUDKIP - .2byte MOVE_REFRESH - .2byte MOVE_UPROAR - .2byte MOVE_CURSE - .2byte MOVE_STOMP - .2byte MOVE_ICE_BALL - .2byte MOVE_MIRROR_COAT - - egg_moves_begin SPECIES_POOCHYENA - .2byte MOVE_ASTONISH - .2byte MOVE_POISON_FANG - .2byte MOVE_COVET - .2byte MOVE_LEER - .2byte MOVE_YAWN - - egg_moves_begin SPECIES_ZIGZAGOON - .2byte MOVE_CHARM - .2byte MOVE_PURSUIT - .2byte MOVE_SUBSTITUTE - .2byte MOVE_TICKLE - .2byte MOVE_TRICK - - egg_moves_begin SPECIES_LOTAD - .2byte MOVE_SYNTHESIS - .2byte MOVE_RAZOR_LEAF - .2byte MOVE_SWEET_SCENT - .2byte MOVE_LEECH_SEED - .2byte MOVE_FLAIL - .2byte MOVE_WATER_GUN - - egg_moves_begin SPECIES_SEEDOT - .2byte MOVE_LEECH_SEED - .2byte MOVE_AMNESIA - .2byte MOVE_QUICK_ATTACK - .2byte MOVE_RAZOR_WIND - .2byte MOVE_TAKE_DOWN - .2byte MOVE_FALSE_SWIPE - - egg_moves_begin SPECIES_NINCADA - .2byte MOVE_ENDURE - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_GUST - .2byte MOVE_SILVER_WIND - - egg_moves_begin SPECIES_TAILLOW - .2byte MOVE_PURSUIT - .2byte MOVE_SUPERSONIC - .2byte MOVE_REFRESH - .2byte MOVE_MIRROR_MOVE - .2byte MOVE_RAGE - .2byte MOVE_SKY_ATTACK - - egg_moves_begin SPECIES_SHROOMISH - .2byte MOVE_FAKE_TEARS - .2byte MOVE_SWAGGER - .2byte MOVE_CHARM - .2byte MOVE_FALSE_SWIPE - .2byte MOVE_HELPING_HAND - - egg_moves_begin SPECIES_SPINDA - .2byte MOVE_ENCORE - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_ASSIST - .2byte MOVE_DISABLE - .2byte MOVE_BATON_PASS - .2byte MOVE_WISH - .2byte MOVE_TRICK - .2byte MOVE_SMELLING_SALT - - egg_moves_begin SPECIES_WINGULL - .2byte MOVE_MIST - .2byte MOVE_TWISTER - .2byte MOVE_AGILITY - .2byte MOVE_GUST - .2byte MOVE_WATER_SPORT - - egg_moves_begin SPECIES_SURSKIT - .2byte MOVE_FORESIGHT - .2byte MOVE_MUD_SHOT - .2byte MOVE_PSYBEAM - .2byte MOVE_HYDRO_PUMP - .2byte MOVE_MIND_READER - - egg_moves_begin SPECIES_WAILMER - .2byte MOVE_DOUBLE_EDGE - .2byte MOVE_THRASH - .2byte MOVE_SWAGGER - .2byte MOVE_SNORE - .2byte MOVE_SLEEP_TALK - .2byte MOVE_CURSE - .2byte MOVE_FISSURE - .2byte MOVE_TICKLE - - egg_moves_begin SPECIES_SKITTY - .2byte MOVE_HELPING_HAND - .2byte MOVE_PSYCH_UP - .2byte MOVE_UPROAR - .2byte MOVE_FAKE_TEARS - .2byte MOVE_WISH - .2byte MOVE_BATON_PASS - .2byte MOVE_SUBSTITUTE - .2byte MOVE_TICKLE - - egg_moves_begin SPECIES_KECLEON - .2byte MOVE_DISABLE - .2byte MOVE_MAGIC_COAT - .2byte MOVE_TRICK - - egg_moves_begin SPECIES_NOSEPASS - .2byte MOVE_MAGNITUDE - .2byte MOVE_ROLLOUT - .2byte MOVE_EXPLOSION - - egg_moves_begin SPECIES_TORKOAL - .2byte MOVE_ERUPTION - .2byte MOVE_ENDURE - .2byte MOVE_SLEEP_TALK - .2byte MOVE_YAWN - - egg_moves_begin SPECIES_SABLEYE - .2byte MOVE_PSYCH_UP - .2byte MOVE_RECOVER - .2byte MOVE_MOONLIGHT - - egg_moves_begin SPECIES_BARBOACH - .2byte MOVE_THRASH - .2byte MOVE_WHIRLPOOL - .2byte MOVE_SPARK - - egg_moves_begin SPECIES_LUVDISC - .2byte MOVE_SPLASH - .2byte MOVE_SUPERSONIC - .2byte MOVE_WATER_SPORT - .2byte MOVE_MUD_SPORT - - egg_moves_begin SPECIES_CORPHISH - .2byte MOVE_MUD_SPORT - .2byte MOVE_ENDEAVOR - .2byte MOVE_BODY_SLAM - .2byte MOVE_ANCIENT_POWER - - egg_moves_begin SPECIES_FEEBAS - .2byte MOVE_MIRROR_COAT - .2byte MOVE_DRAGON_BREATH - .2byte MOVE_MUD_SPORT - .2byte MOVE_HYPNOSIS - .2byte MOVE_LIGHT_SCREEN - .2byte MOVE_CONFUSE_RAY - - egg_moves_begin SPECIES_CARVANHA - .2byte MOVE_HYDRO_PUMP - .2byte MOVE_DOUBLE_EDGE - .2byte MOVE_THRASH - - egg_moves_begin SPECIES_TRAPINCH - .2byte MOVE_FOCUS_ENERGY - .2byte MOVE_QUICK_ATTACK - .2byte MOVE_GUST - - egg_moves_begin SPECIES_MAKUHITA - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_DETECT - .2byte MOVE_FORESIGHT - .2byte MOVE_HELPING_HAND - .2byte MOVE_CROSS_CHOP - .2byte MOVE_REVENGE - .2byte MOVE_DYNAMIC_PUNCH - .2byte MOVE_COUNTER - - egg_moves_begin SPECIES_ELECTRIKE - .2byte MOVE_CRUNCH - .2byte MOVE_HEADBUTT - .2byte MOVE_UPROAR - .2byte MOVE_CURSE - .2byte MOVE_SWIFT - - egg_moves_begin SPECIES_NUMEL - .2byte MOVE_HOWL - .2byte MOVE_SCARY_FACE - .2byte MOVE_BODY_SLAM - .2byte MOVE_ROLLOUT - .2byte MOVE_DEFENSE_CURL - .2byte MOVE_STOMP - - egg_moves_begin SPECIES_SPHEAL - .2byte MOVE_WATER_SPORT - .2byte MOVE_STOCKPILE - .2byte MOVE_SWALLOW - .2byte MOVE_SPIT_UP - .2byte MOVE_YAWN - .2byte MOVE_ROCK_SLIDE - .2byte MOVE_CURSE - .2byte MOVE_FISSURE - - egg_moves_begin SPECIES_CACNEA - .2byte MOVE_GRASS_WHISTLE - .2byte MOVE_ACID - .2byte MOVE_TEETER_DANCE - .2byte MOVE_DYNAMIC_PUNCH - .2byte MOVE_COUNTER - - egg_moves_begin SPECIES_SNORUNT - .2byte MOVE_BLOCK - .2byte MOVE_SPIKES - - egg_moves_begin SPECIES_AZURILL - .2byte MOVE_ENCORE - .2byte MOVE_SING - .2byte MOVE_REFRESH - .2byte MOVE_SLAM - .2byte MOVE_TICKLE - - egg_moves_begin SPECIES_SPOINK - .2byte MOVE_FUTURE_SIGHT - .2byte MOVE_EXTRASENSORY - .2byte MOVE_SUBSTITUTE - .2byte MOVE_TRICK - - egg_moves_begin SPECIES_PLUSLE - .2byte MOVE_SUBSTITUTE - .2byte MOVE_WISH - - egg_moves_begin SPECIES_MINUN - .2byte MOVE_SUBSTITUTE - .2byte MOVE_WISH - - egg_moves_begin SPECIES_MAWILE - .2byte MOVE_SWORDS_DANCE - .2byte MOVE_FALSE_SWIPE - .2byte MOVE_POISON_FANG - .2byte MOVE_PSYCH_UP - .2byte MOVE_ANCIENT_POWER - .2byte MOVE_TICKLE - - egg_moves_begin SPECIES_MEDITITE - .2byte MOVE_FIRE_PUNCH - .2byte MOVE_THUNDER_PUNCH - .2byte MOVE_ICE_PUNCH - .2byte MOVE_FORESIGHT - .2byte MOVE_FAKE_OUT - .2byte MOVE_BATON_PASS - .2byte MOVE_DYNAMIC_PUNCH - - egg_moves_begin SPECIES_SWABLU - .2byte MOVE_AGILITY - .2byte MOVE_HAZE - .2byte MOVE_PURSUIT - .2byte MOVE_RAGE - - egg_moves_begin SPECIES_DUSKULL - .2byte MOVE_IMPRISON - .2byte MOVE_DESTINY_BOND - .2byte MOVE_PAIN_SPLIT - .2byte MOVE_GRUDGE - .2byte MOVE_MEMENTO - .2byte MOVE_FAINT_ATTACK - - egg_moves_begin SPECIES_ROSELIA - .2byte MOVE_SPIKES - .2byte MOVE_SYNTHESIS - .2byte MOVE_PIN_MISSILE - .2byte MOVE_COTTON_SPORE - - egg_moves_begin SPECIES_SLAKOTH - .2byte MOVE_PURSUIT - .2byte MOVE_SLASH - .2byte MOVE_BODY_SLAM - .2byte MOVE_SNORE - .2byte MOVE_CRUSH_CLAW - .2byte MOVE_CURSE - .2byte MOVE_SLEEP_TALK - - egg_moves_begin SPECIES_GULPIN - .2byte MOVE_DREAM_EATER - .2byte MOVE_ACID_ARMOR - .2byte MOVE_SMOG - .2byte MOVE_PAIN_SPLIT - - egg_moves_begin SPECIES_TROPIUS - .2byte MOVE_HEADBUTT - .2byte MOVE_SLAM - .2byte MOVE_RAZOR_WIND - .2byte MOVE_LEECH_SEED - .2byte MOVE_NATURE_POWER - - egg_moves_begin SPECIES_WHISMUR - .2byte MOVE_TAKE_DOWN - .2byte MOVE_SNORE - .2byte MOVE_SWAGGER - .2byte MOVE_EXTRASENSORY - .2byte MOVE_SMELLING_SALT - - egg_moves_begin SPECIES_CLAMPERL - .2byte MOVE_REFRESH - .2byte MOVE_MUD_SPORT - .2byte MOVE_BODY_SLAM - .2byte MOVE_SUPERSONIC - .2byte MOVE_BARRIER - .2byte MOVE_CONFUSE_RAY - - egg_moves_begin SPECIES_ABSOL - .2byte MOVE_BATON_PASS - .2byte MOVE_FAINT_ATTACK - .2byte MOVE_DOUBLE_EDGE - .2byte MOVE_MAGIC_COAT - .2byte MOVE_CURSE - .2byte MOVE_SUBSTITUTE - - egg_moves_begin SPECIES_SHUPPET - .2byte MOVE_DISABLE - .2byte MOVE_DESTINY_BOND - .2byte MOVE_FORESIGHT - .2byte MOVE_ASTONISH - .2byte MOVE_IMPRISON - - egg_moves_begin SPECIES_SEVIPER - .2byte MOVE_STOCKPILE - .2byte MOVE_SWALLOW - .2byte MOVE_SPIT_UP - .2byte MOVE_BODY_SLAM - - egg_moves_begin SPECIES_ZANGOOSE - .2byte MOVE_FLAIL - .2byte MOVE_DOUBLE_KICK - .2byte MOVE_RAZOR_WIND - .2byte MOVE_COUNTER - .2byte MOVE_ROAR - .2byte MOVE_CURSE - - egg_moves_begin SPECIES_RELICANTH - .2byte MOVE_MAGNITUDE - .2byte MOVE_SKULL_BASH - .2byte MOVE_WATER_SPORT - .2byte MOVE_AMNESIA - .2byte MOVE_SLEEP_TALK - .2byte MOVE_ROCK_SLIDE - - egg_moves_begin SPECIES_ARON - .2byte MOVE_ENDEAVOR - .2byte MOVE_BODY_SLAM - .2byte MOVE_STOMP - .2byte MOVE_SMELLING_SALT - - egg_moves_begin SPECIES_CASTFORM - .2byte MOVE_FUTURE_SIGHT - .2byte MOVE_PSYCH_UP - - egg_moves_begin SPECIES_VOLBEAT - .2byte MOVE_BATON_PASS - .2byte MOVE_SILVER_WIND - .2byte MOVE_TRICK - - egg_moves_begin SPECIES_ILLUMISE - .2byte MOVE_BATON_PASS - .2byte MOVE_SILVER_WIND - .2byte MOVE_GROWTH - - egg_moves_begin SPECIES_LILEEP - .2byte MOVE_BARRIER - .2byte MOVE_RECOVER - .2byte MOVE_MIRROR_COAT - .2byte MOVE_ROCK_SLIDE - - egg_moves_begin SPECIES_ANORITH - .2byte MOVE_RAPID_SPIN - .2byte MOVE_KNOCK_OFF - .2byte MOVE_SWORDS_DANCE - .2byte MOVE_ROCK_SLIDE - - egg_moves_begin SPECIES_RALTS - .2byte MOVE_DISABLE - .2byte MOVE_WILL_O_WISP - .2byte MOVE_MEAN_LOOK - .2byte MOVE_MEMENTO - .2byte MOVE_DESTINY_BOND - - egg_moves_begin SPECIES_BAGON - .2byte MOVE_HYDRO_PUMP - .2byte MOVE_THRASH - .2byte MOVE_DRAGON_RAGE - .2byte MOVE_TWISTER - .2byte MOVE_DRAGON_DANCE - - egg_moves_begin SPECIES_CHIMECHO - .2byte MOVE_DISABLE - .2byte MOVE_CURSE - .2byte MOVE_HYPNOSIS - .2byte MOVE_DREAM_EATER - - .2byte -1 -- cgit v1.2.3 From add1b59b63bd00bd481333f6e68940cbc30208fc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 9 Sep 2017 14:59:57 -0400 Subject: npc_pal_op and all data --- data/field_effect_helpers.s | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 data/field_effect_helpers.s (limited to 'data') diff --git a/data/field_effect_helpers.s b/data/field_effect_helpers.s deleted file mode 100644 index d22bd8dde..000000000 --- a/data/field_effect_helpers.s +++ /dev/null @@ -1,37 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -@ XXX: Unused? Probably aligned because it's at the beginning of an object file. - .align 2 - .string "タマゴ$" - - .align 1 -gUnknown_08401E2C:: @ 8401E2C - .2byte 0xC, 0x1C, 0x2C - -gUnknown_08401E32:: @ 8401E32 - .byte 0, 1, 2, 3 - - .align 1 -gUnknown_08401E36:: @ 8401E36 - .2byte 4, 4, 4, 16 - - .align 2 -gUnknown_08401E40:: @ 8401E40 - .4byte sub_81275A0 - .4byte sub_81275C4 - - .align 2 -gUnknown_08401E48:: @ 8401E48 - .4byte sub_8127DA0 - .4byte sub_8127DD0 - .4byte sub_8127E30 - -gUnknown_08401E54:: @ 8401E54 - .byte 0, 0, 1, 2, 3 - - .align 1 -gUnknown_08401E5A:: @ 8401E5A - .2byte 3, 7 -- cgit v1.2.3 From 95f856c39e81e2b723065e757b4dcf577441c558 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 9 Sep 2017 18:17:09 -0500 Subject: more script_menu refactoring --- data/event_scripts.s | 2 +- data/specials.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 33bb39308..6a95dd4a1 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1688,7 +1688,7 @@ gUnknown_081A0009:: @ 81A0009 EventScript_1A0023: message gPCText_WhichPCShouldBeAccessed waittext - special TryCreatePCMenu + special ScriptMenu_TryCreatePCMenu waitstate jump EventScript_1A0033 end diff --git a/data/specials.inc b/data/specials.inc index a17bc943a..051a84bdb 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -269,7 +269,7 @@ gSpecials:: def_special ShowBerryBlenderRecordWindow def_special ResetTrickHouseEndRoomFlag def_special SetTrickHouseEndRoomFlag - def_special TryCreatePCMenu + def_special ScriptMenu_TryCreatePCMenu def_special AccessHallOfFamePC def_special sub_810D6A4 def_special CheckLeadMonCool -- cgit v1.2.3 From 7309b13cb34400e0256c09fd54664a3f918b4e3d Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 9 Sep 2017 19:29:05 -0500 Subject: fix German build --- data/event_scripts.s | 2 +- data/specials.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 6a95dd4a1..5e2763653 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1688,7 +1688,7 @@ gUnknown_081A0009:: @ 81A0009 EventScript_1A0023: message gPCText_WhichPCShouldBeAccessed waittext - special ScriptMenu_TryCreatePCMenu + special ScrSpecial_CreatePCMenu waitstate jump EventScript_1A0033 end diff --git a/data/specials.inc b/data/specials.inc index 051a84bdb..61670a867 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -269,7 +269,7 @@ gSpecials:: def_special ShowBerryBlenderRecordWindow def_special ResetTrickHouseEndRoomFlag def_special SetTrickHouseEndRoomFlag - def_special ScriptMenu_TryCreatePCMenu + def_special ScrSpecial_CreatePCMenu def_special AccessHallOfFamePC def_special sub_810D6A4 def_special CheckLeadMonCool -- cgit v1.2.3 From 5e9e52e3a95f4d7301565ad86084907f2d8a94e6 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 9 Sep 2017 22:04:01 -0500 Subject: more renaming/refactoring --- data/scripts/maps/Route101.inc | 2 +- data/specials.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 8462603a6..1acd4b598 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -224,7 +224,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F movesprite 255, 6, 13 move 255, Route101_Movement_1A083F waitmove 0 - special ChooseStarter + special ScrSpecial_ChooseStarter waitstate move 2, Route101_Movement_14EAD7 waitmove 0 diff --git a/data/specials.inc b/data/specials.inc index 61670a867..891d2cfd7 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -163,7 +163,7 @@ gSpecials:: def_special sub_8053E90 def_special StartWallClock def_special sub_810D6B8 - def_special ChooseStarter + def_special ScrSpecial_ChooseStarter def_special StartBattle_WallyTutorial def_special sub_80BF9F8 def_special sub_80F9A0C -- cgit v1.2.3 From df71c1a803e49b93dfb19cdac6cf71621d82d89a Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 10 Sep 2017 12:34:41 -0500 Subject: lots more renaming --- data/event_scripts.s | 2 +- data/specials.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 5e2763653..80f3cd40a 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1040,7 +1040,7 @@ EventScript_19F8F2: waittext waitbutton reptrainerbattle - specialval RESULT, sub_8082558 + specialval RESULT, ScrSpecial_GetTrainerBattleMode compare RESULT, 0 jumpeq EventScript_19F934 compare RESULT, 2 diff --git a/data/specials.inc b/data/specials.inc index 891d2cfd7..ae2a4d8ef 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -58,7 +58,7 @@ gSpecials:: def_special FieldObjectInteractionWaterBerryTree def_special PlayerHasBerries def_special IsEnigmaBerryValid - def_special sub_8082558 + def_special ScrSpecial_GetTrainerBattleMode def_special sub_80826D8 def_special sub_8082718 def_special sub_8082564 -- cgit v1.2.3 From 6f9ad223a51eab0a2d39296c963486689392d0b5 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 10 Sep 2017 16:21:30 -0500 Subject: stuff --- data/event_scripts.s | 24 ++++++++-------- data/scripts/maps/AncientTomb.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 2 +- data/scripts/maps/DesertRuins.inc | 2 +- data/scripts/maps/IslandCave.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 2 +- data/scripts/maps/SkyPillar_Top.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 2 +- data/specials.inc | 22 +++++++------- data/trainer_see.s | 41 --------------------------- 10 files changed, 30 insertions(+), 71 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 80f3cd40a..2d0b1b4fe 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -931,7 +931,7 @@ SecretBase_RedCave1_EventScript_19F806:: @ 819F806 gUnknown_0819F80B:: @ 819F80B lock special PlayTrainerEncounterMusic - special sub_80847C8 + special ScrSpecial_EndTrainerApproach waitstate jump EventScript_19F8F2 @@ -940,7 +940,7 @@ gUnknown_0819F818:: @ 819F818 faceplayer move LAST_TALKED, Movement_19F8F0 waitmove 0 - specialval RESULT, sub_8082564 + specialval RESULT, ScrSpecial_HasTrainerBeenFought compare RESULT, 0 jumpif 5, EventScript_19F83F special PlayTrainerEncounterMusic @@ -954,7 +954,7 @@ gUnknown_0819F840:: @ 819F840 lock faceplayer call EventScript_19F8E5 - specialval RESULT, sub_8082564 + specialval RESULT, ScrSpecial_HasTrainerBeenFought compare RESULT, 0 jumpif 5, EventScript_19F877 special CheckForAlivePartyMons @@ -965,7 +965,7 @@ gUnknown_0819F840:: @ 819F840 jump EventScript_19F8F2 EventScript_19F870: - special sub_8082718 + special ScrSpecial_ShowTrainerNonBattlingSpeech waittext waitbutton release @@ -983,15 +983,15 @@ gUnknown_0819F878:: @ 819F878 gUnknown_0819F887:: @ 819F887 call EventScript_19F8E5 - specialval RESULT, sub_8082C9C + specialval RESULT, ScrSpecial_GetTrainerEyeRematchFlag compare RESULT, 0 jumpeq EventScript_19F8AD special PlayTrainerEncounterMusic special sub_8082524 - special sub_80826D8 + special ScrSpecial_ShowTrainerIntroSpeech waittext waitbutton - special sub_80826B0 + special ScrSpecial_StartTrainerEyeRematch waitstate releaseall end @@ -1000,7 +1000,7 @@ EventScript_19F8AD: endtrainerbattle gUnknown_0819F8AE:: @ 819F8AE - specialval RESULT, sub_8082C9C + specialval RESULT, ScrSpecial_GetTrainerEyeRematchFlag compare RESULT, 0 jumpeq EventScript_19F8DD special CheckForAlivePartyMons @@ -1008,10 +1008,10 @@ gUnknown_0819F8AE:: @ 819F8AE jumpif 5, EventScript_19F8DE special PlayTrainerEncounterMusic special sub_8082524 - special sub_80826D8 + special ScrSpecial_ShowTrainerIntroSpeech waittext waitbutton - special sub_80826B0 + special ScrSpecial_StartTrainerEyeRematch waitstate releaseall end @@ -1020,7 +1020,7 @@ EventScript_19F8DD: endtrainerbattle EventScript_19F8DE: - special sub_8082718 + special ScrSpecial_ShowTrainerNonBattlingSpeech waittext waitbutton release @@ -1036,7 +1036,7 @@ Movement_19F8F0:: step_end EventScript_19F8F2: - special sub_80826D8 + special ScrSpecial_ShowTrainerIntroSpeech waittext waitbutton reptrainerbattle diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 7ba7540c4..bfc5b6a79 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -64,7 +64,7 @@ AncientTomb_EventScript_15F050:: @ 815F050 setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE setflag 937 setflag 2145 - special StartBattle_Regi + special ScrSpecial_StartRegiBattle waitstate clearflag 2145 release diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 023892d36..5517a9c7e 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -62,7 +62,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 pause 40 waitpokecry setflag 2145 - special StartBattle_GroudonKyogre + special ScrSpecial_StartGroudonKyogreBattle waitstate clearflag 2145 specialval RESULT, sub_810E300 diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index df40fc126..97a22bae3 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -64,7 +64,7 @@ DesertRuins_EventScript_15CB85:: @ 815CB85 setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE setflag 935 setflag 2145 - special StartBattle_Regi + special ScrSpecial_StartRegiBattle waitstate clearflag 2145 release diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index b16f386d8..8f2ce6dc1 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -84,7 +84,7 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D setwildbattle SPECIES_REGICE, 40, ITEM_NONE setflag 936 setflag 2145 - special StartBattle_Regi + special ScrSpecial_StartRegiBattle waitstate clearflag 2145 release diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index dc5efe243..123b099fe 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -32,7 +32,7 @@ PetalburgCity_EventScript_14B747:: @ 814B747 move 255, PetalburgCity_Movement_14B7CC waitmove 0 msgbox PetalburgCity_Text_16D361, 4 - special StartBattle_WallyTutorial + special ScrSpecial_StartWallyTutorialBattle waitstate msgbox PetalburgCity_Text_16D3DE, 4 movecoords 2, PetalburgCity_Movement_1A083F, 0, 0 diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index 23db6a8ea..d659a23c1 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -21,7 +21,7 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316 waitpokecry setflag 773 setflag 2145 - special StartBattle_Rayquaza + special ScrSpecial_StartRayquazaBattle waitstate clearflag 2145 release diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 3adf3545f..e5eaadab5 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -67,7 +67,7 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW setflag 911 setflag 2145 - special StartBattle_SouthernIsland + special ScrSpecial_StartSouthernIslandBattle waitstate clearflag 2145 releaseall diff --git a/data/specials.inc b/data/specials.inc index ae2a4d8ef..99a4a218c 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -59,14 +59,14 @@ gSpecials:: def_special PlayerHasBerries def_special IsEnigmaBerryValid def_special ScrSpecial_GetTrainerBattleMode - def_special sub_80826D8 - def_special sub_8082718 - def_special sub_8082564 - def_special sub_80847C8 + def_special ScrSpecial_ShowTrainerIntroSpeech + def_special ScrSpecial_ShowTrainerNonBattlingSpeech + def_special ScrSpecial_HasTrainerBeenFought + def_special ScrSpecial_EndTrainerApproach def_special PlayTrainerEncounterMusic def_special sub_8082C68 - def_special sub_8082C9C - def_special sub_80826B0 + def_special ScrSpecial_GetTrainerEyeRematchFlag + def_special ScrSpecial_StartTrainerEyeRematch def_special ShowPokemonStorageSystem def_special CheckForAlivePartyMons def_special TurnOffTVScreen @@ -164,7 +164,7 @@ gSpecials:: def_special StartWallClock def_special sub_810D6B8 def_special ScrSpecial_ChooseStarter - def_special StartBattle_WallyTutorial + def_special ScrSpecial_StartWallyTutorialBattle def_special sub_80BF9F8 def_special sub_80F9A0C def_special sub_810CA00 @@ -318,9 +318,9 @@ gSpecials:: def_special IsPokerusInParty def_special sub_8069D78 def_special sub_810F758 - def_special StartBattle_GroudonKyogre - def_special StartBattle_Rayquaza - def_special StartBattle_Regi + def_special ScrSpecial_StartGroudonKyogreBattle + def_special ScrSpecial_StartRayquazaBattle + def_special ScrSpecial_StartRegiBattle def_special sub_8082524 def_special DoSealedChamberShakingEffect2 def_special sub_810F828 @@ -330,7 +330,7 @@ gSpecials:: def_special ShowContestEntryMonPic def_special sub_80C5164 def_special sub_8134AB4 - def_special StartBattle_SouthernIsland + def_special ScrSpecial_StartSouthernIslandBattle def_special SetRoute119Weather def_special SetRoute123Weather def_special ScriptGetMultiplayerId diff --git a/data/trainer_see.s b/data/trainer_see.s index 57eeae061..04a787f0c 100644 --- a/data/trainer_see.s +++ b/data/trainer_see.s @@ -3,47 +3,6 @@ .section .rodata - .align 2 -gSpriteImage_839B308:: @ 839B308 - .incbin "graphics/unknown_sprites/839B4E0/0.4bpp" - - .align 2 -gSpriteImage_839B388:: @ 839B388 - .incbin "graphics/unknown_sprites/839B4E0/1.4bpp" - - .align 2 -gSpriteImage_839B408:: @ 839B408 - .incbin "graphics/unknown_sprites/839B408.4bpp" - - .align 2 -gIsTrainerInRange:: @ 839B488 - .4byte IsTrainerInRangeSouth - .4byte IsTrainerInRangeNorth - .4byte IsTrainerInRangeWest - .4byte IsTrainerInRangeEast - - .align 2 -gTrainerSeeFuncList:: @ 839B498 - .4byte sub_8084394 - .4byte sub_8084398 - .4byte sub_80843DC - .4byte sub_808441C - .4byte sub_8084478 - .4byte sub_8084534 - .4byte sub_8084578 - .4byte sub_80845AC - .4byte sub_80845C8 - .4byte sub_80845FC - .4byte sub_8084654 - .4byte sub_80846C8 - - .align 2 -gTrainerSeeFuncList2:: @ 839B4C8 - .4byte sub_80845C8 - .4byte sub_80845FC - .4byte sub_8084654 - .4byte sub_80846C8 - .align 2 gOamData_839B4D8:: @ 839B4D8 .2byte 0x0000 -- cgit v1.2.3 From a185f8a26dc5e5a04908c272ab54bede7af8a10c Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 12 Sep 2017 16:53:04 -0500 Subject: lots more relabeling --- data/event_scripts.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 2d0b1b4fe..3ea5cee24 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1324,7 +1324,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70 setflag 2141 return -EventScript_LeagueWhiteOut:: @ 819FC74 +S_WhiteOut:: @ 819FC74 call EverGrandeCity_HallOfFame_EventScript_19FD09 call EventScript_19FC84 jump gUnknown_0819FC9F -- cgit v1.2.3 From 02104e52ddfcbd2a8a00af5d8b169b732e84a7cb Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 12 Sep 2017 17:26:13 -0500 Subject: move data to overworld.c --- data/rom4.s | 66 ------------------------------------------------------------- 1 file changed, 66 deletions(-) delete mode 100644 data/rom4.s (limited to 'data') diff --git a/data/rom4.s b/data/rom4.s deleted file mode 100644 index 6f883c64c..000000000 --- a/data/rom4.s +++ /dev/null @@ -1,66 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gDummyWarpData:: @ 8216624 - .byte -1 - .byte -1 - .byte -1 - .space 1 - .2byte -1 - .2byte -1 - -@ unused, unknown data - .byte 0xB0, 0x04, 0x00, 0x00 - .byte 0x10, 0x0E, 0x00, 0x00 - .byte 0xB0, 0x04, 0x00, 0x00 - .byte 0x60, 0x09, 0x00, 0x00 - .byte 0x32, 0x00, 0x00, 0x00 - .byte 0x50, 0x00, 0x00, 0x00 - .byte 0xD4, 0xFF, 0xFF, 0xFF - .byte 0x2C, 0x00, 0x00, 0x00 - - .align 2 -gUnknown_0821664C:: @ 821664C - .4byte 0, 0 - .4byte 0, 1 - .4byte 0, -1 - .4byte -1, 0 - .4byte 1, 0 - .4byte -1, 1 - .4byte 1, 1 - .4byte -1, -1 - .4byte 1, -1 - - .align 2 -gUnknown_08216694:: @ 8216694 - .4byte REG_WIN0H - .4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1 - .4byte 1 - - .align 2 -gUnknown_082166A0:: @ 82166A0 - .4byte sub_8055C68 - .4byte sub_8055C88 - .4byte sub_8055C8C - - .align 2 -gUnknown_082166AC:: @ 82166AC - .4byte sub_8055CAC - .4byte sub_8055CB0 - .4byte sub_8055CB0 - .4byte sub_8055CB0 - .4byte sub_8055CB0 - .4byte sub_8055CAC - .4byte sub_8055CAC - .4byte sub_8055D18 - .4byte sub_8055D18 - .4byte sub_8055D18 - .4byte sub_8055D18 - - .align 2 -gUnknown_082166D8:: @ 82166D8 - .4byte sub_8055D30 - .4byte sub_8055D38 -- cgit v1.2.3 From 2c87516ca3efa260b96b92ededb24d75edfe49e8 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 12 Sep 2017 20:23:23 -0500 Subject: more labels and fix build --- data/event_scripts.s | 59 +++++++++++------------- data/field_move_scripts.inc | 2 +- data/scripts/cable_club.inc | 6 +-- data/scripts/maps/BattleTower_Lobby.inc | 2 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 2 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 2 +- data/scripts/pokeblocks.inc | 2 +- data/specials.inc | 4 +- 8 files changed, 37 insertions(+), 42 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 3ea5cee24..171581dd9 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -918,13 +918,8 @@ Std_5: @ 819F805 return -BattleTower_Lobby_EventScript_19F806:: @ 819F806 -FallarborTown_ContestLobby_EventScript_19F806:: @ 819F806 -LilycoveCity_ContestLobby_EventScript_19F806:: @ 819F806 -MossdeepCity_GameCorner_1F_EventScript_19F806:: @ 819F806 -OldaleTown_PokemonCenter_2F_EventScript_19F806:: @ 819F806 -SecretBase_RedCave1_EventScript_19F806:: @ 819F806 - special InitSaveDialog +S_DoSaveDialog:: @ 819F806 + special ScrSpecial_DoSaveDialog waitstate return @@ -1437,16 +1432,16 @@ SootopolisCity_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B lock faceplayer - msgbox OldaleTown_PokemonCenter_1F_Text_1A0A7D, 5 + msgbox gText_NurseJoy_Welcome, MSGBOX_YESNO compare RESULT, 1 - jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FD7C + jumpeq do_heal_party compare RESULT, 0 - jumpeq OldaleTown_PokemonCenter_1F_EventScript_19FDC7 + jumpeq dont_heal_party end -OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C +do_heal_party:: @ 819FD7C inccounter GAME_STAT_USED_POKECENTER - message OldaleTown_PokemonCenter_1F_Text_1A1245 + message gText_NurseJoy_OkayIllTakeYourPokemon waittext move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A083F waitmove 0 @@ -1461,16 +1456,16 @@ OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C end OldaleTown_PokemonCenter_1F_EventScript_19FDB0:: @ 819FDB0 - message OldaleTown_PokemonCenter_1F_Text_1A0B14 + message gText_NurseJoy_ThankYouForWaiting waittext move 0x800b, OldaleTown_PokemonCenter_1F_Movement_19FDF4 waitmove 0 - message OldaleTown_PokemonCenter_1F_Text_1A0AFA + message gText_NurseJoy_WeHopeToSeeYouAgain waittext return -OldaleTown_PokemonCenter_1F_EventScript_19FDC7:: @ 819FDC7 - message OldaleTown_PokemonCenter_1F_Text_1A0AFA +dont_heal_party:: @ 819FDC7 + message gText_NurseJoy_WeHopeToSeeYouAgain waittext return @@ -1483,7 +1478,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE end OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA - message OldaleTown_PokemonCenter_1F_Text_1A1275 + message gText_NurseJoy_Pokerus waittext setflag 273 return @@ -2985,17 +2980,17 @@ UnknownString_81A0A54: @ 81A0A54 UnknownString_81A0A66: @ 81A0A66 .string "Accessed LANETTE’s PC.$" -OldaleTown_PokemonCenter_1F_Text_1A0A7D:: @ 81A0A7D +gText_NurseJoy_Welcome:: @ 81A0A7D .string "Hello, and welcome to the POKéMON\n" .string "CENTER.\p" .string "We restore your tired POKéMON to\n" .string "full health.\p" .string "Would you like to rest your POKéMON?$" -OldaleTown_PokemonCenter_1F_Text_1A0AFA:: @ 81A0AFA +gText_NurseJoy_WeHopeToSeeYouAgain:: @ 81A0AFA .string "We hope to see you again!$" -OldaleTown_PokemonCenter_1F_Text_1A0B14:: @ 81A0B14 +gText_NurseJoy_ThankYouForWaiting:: @ 81A0B14 .string "Thank you for waiting.\p" .string "We’ve restored your POKéMON to\n" .string "full health.$" @@ -3209,11 +3204,11 @@ SlateportCity_Text_1A116E:: @ 81A116E .string "We’ll accept you as a member and sell\n" .string "you good stuff in secrecy.$" -OldaleTown_PokemonCenter_1F_Text_1A1245:: @ 81A1245 +gText_NurseJoy_OkayIllTakeYourPokemon:: @ 81A1245 .string "Okay, I’ll take your POKéMON for a\n" .string "few seconds.$" -OldaleTown_PokemonCenter_1F_Text_1A1275:: @ 81A1275 +gText_NurseJoy_Pokerus:: @ 81A1275 .string "Your POKéMON may be infected with\n" .string "POKéRUS.\p" .string "Little is known about the POKéRUS\n" @@ -3949,7 +3944,7 @@ SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032 jumpeq SecretBase_RedCave1_EventScript_1A308F setvar RESULT, 1 special sub_80BCE4C - call SecretBase_RedCave1_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A308F hidebox 0, 0, 15, 10 @@ -3984,7 +3979,7 @@ SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE jumpeq SecretBase_RedCave1_EventScript_1A310B setvar RESULT, 1 special sub_80BCE4C - call SecretBase_RedCave1_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A310B hidebox 0, 0, 15, 10 @@ -4019,7 +4014,7 @@ SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A jumpeq SecretBase_RedCave1_EventScript_1A3187 setvar RESULT, 1 special sub_80BCE4C - call SecretBase_RedCave1_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A3187 hidebox 0, 0, 15, 10 @@ -4054,7 +4049,7 @@ SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6 jumpeq SecretBase_RedCave1_EventScript_1A3203 setvar RESULT, 1 special sub_80BCE4C - call SecretBase_RedCave1_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A3203 hidebox 0, 0, 15, 10 @@ -4089,7 +4084,7 @@ SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222 jumpeq SecretBase_RedCave1_EventScript_1A327F setvar RESULT, 1 special sub_80BCE4C - call SecretBase_RedCave1_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A327F hidebox 0, 0, 15, 10 @@ -4124,7 +4119,7 @@ SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E jumpeq SecretBase_RedCave1_EventScript_1A32FB setvar RESULT, 1 special sub_80BCE4C - call SecretBase_RedCave1_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A32FB hidebox 0, 0, 15, 10 @@ -4159,7 +4154,7 @@ SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A jumpeq SecretBase_RedCave1_EventScript_1A3377 setvar RESULT, 1 special sub_80BCE4C - call SecretBase_RedCave1_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A3377 hidebox 0, 0, 15, 10 @@ -4194,7 +4189,7 @@ SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396 jumpeq SecretBase_RedCave1_EventScript_1A33F3 setvar RESULT, 1 special sub_80BCE4C - call SecretBase_RedCave1_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A33F3 hidebox 0, 0, 15, 10 @@ -4229,7 +4224,7 @@ SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412 jumpeq SecretBase_RedCave1_EventScript_1A346F setvar RESULT, 1 special sub_80BCE4C - call SecretBase_RedCave1_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A346F hidebox 0, 0, 15, 10 @@ -4264,7 +4259,7 @@ SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E jumpeq SecretBase_RedCave1_EventScript_1A34EB setvar RESULT, 1 special sub_80BCE4C - call SecretBase_RedCave1_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq SecretBase_RedCave1_EventScript_1A34EB hidebox 0, 0, 15, 10 diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 315217055..acf5e9e17 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -90,7 +90,7 @@ DoRockSmashMovement: @ 81B0F0C specialval RESULT, sub_810F5BC compare RESULT, 1 jumpeq DoRockSmashMovement_Done - special RockSmashWildEncounter + special ScrSpecial_RockSmashWildEncounter compare RESULT, 0 jumpeq DoRockSmashMovement_Done waitstate diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 4a919c597..5728b52d8 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -191,7 +191,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EBC:: @ 81A3EBC case 127, OldaleTown_PokemonCenter_2F_EventScript_1A4319 OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2 - call OldaleTown_PokemonCenter_2F_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319 call OldaleTown_PokemonCenter_2F_EventScript_1A3FEF @@ -361,7 +361,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA call OldaleTown_PokemonCenter_2F_EventScript_1A41BB compare RESULT, 0 jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319 - call OldaleTown_PokemonCenter_2F_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C @@ -455,7 +455,7 @@ VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4229 OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229 - call OldaleTown_PokemonCenter_2F_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A4319 message OldaleTown_PokemonCenter_2F_Text_1A490C diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 8cd3639a5..a1570ac13 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -242,7 +242,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 special LoadPlayerParty closebutton pause 2 - call BattleTower_Lobby_EventScript_19F806 + call S_DoSaveDialog setvar 0x4000, 5 hidebox 0, 0, 15, 10 compare RESULT, 0 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 3c8cc5bdf..6bdcf55e2 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -330,7 +330,7 @@ LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4 msgbox LilycoveCity_ContestLobby_Text_188521, 5 compare RESULT, 0 jumpeq LilycoveCity_ContestLobby_EventScript_158C35 - call LilycoveCity_ContestLobby_EventScript_19F806 + call S_DoSaveDialog hidebox 0, 0, 15, 9 compare RESULT, 0 jumpeq LilycoveCity_ContestLobby_EventScript_158C35 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 14836f3e0..59669596a 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -103,7 +103,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 compare RESULT, 0 callif 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8 special LoadPlayerParty - call MossdeepCity_GameCorner_1F_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq MossdeepCity_GameCorner_1F_EventScript_15ADE8 hidebox 0, 0, 15, 10 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index e1add8734..852acd292 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -235,7 +235,7 @@ FallarborTown_ContestLobby_EventScript_1B7897:: @ 81B7897 end FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1 - call FallarborTown_ContestLobby_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq FallarborTown_ContestLobby_EventScript_1B7936 message FallarborTown_ContestLobby_Text_1B7304 diff --git a/data/specials.inc b/data/specials.inc index 99a4a218c..1baa55442 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -100,7 +100,7 @@ gSpecials:: def_special sub_80C5044 def_special GiveMonArtistRibbon def_special sub_808363C - def_special InitSaveDialog + def_special ScrSpecial_DoSaveDialog def_special DoWateringBerryTreeAnim def_special sub_80E60D8 def_special sub_80EB7C4 @@ -178,7 +178,7 @@ gSpecials:: def_special sub_810FF48 def_special sub_810FAA0 def_special sub_810FF60 - def_special RockSmashWildEncounter + def_special ScrSpecial_RockSmashWildEncounter def_special GabbyAndTyGetBattleNum def_special sub_80BDC14 def_special GabbyAndTyBeforeInterview -- cgit v1.2.3 From 270bd98d41a19c516a4be95f522deb26cc4300a9 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 13 Sep 2017 00:03:22 -0500 Subject: more labeling --- data/event_scripts.s | 14 ++++---- data/field_move_scripts.inc | 18 +++++----- data/maps/events/FieryPath.inc | 12 +++---- data/maps/events/GraniteCave_B2F.inc | 14 ++++---- data/maps/events/PetalburgWoods.inc | 4 +-- data/maps/events/Route102.inc | 4 +-- data/maps/events/Route103.inc | 10 +++--- data/maps/events/Route104.inc | 22 ++++++------ data/maps/events/Route110.inc | 6 ++-- data/maps/events/Route110_TrickHousePuzzle1.inc | 30 ++++++++-------- data/maps/events/Route110_TrickHousePuzzle3.inc | 12 +++---- data/maps/events/Route110_TrickHousePuzzle4.inc | 22 ++++++------ data/maps/events/Route111.inc | 14 ++++---- data/maps/events/Route112.inc | 8 ++--- data/maps/events/Route114.inc | 16 ++++----- data/maps/events/Route115.inc | 12 +++---- data/maps/events/Route116.inc | 16 ++++----- data/maps/events/Route117.inc | 8 ++--- data/maps/events/Route118.inc | 8 ++--- data/maps/events/Route119.inc | 14 ++++---- data/maps/events/Route120.inc | 26 +++++++------- data/maps/events/Route121.inc | 22 ++++++------ data/maps/events/Route123.inc | 42 +++++++++++----------- data/maps/events/Route130.inc | 2 +- data/maps/events/RusturfTunnel.inc | 4 +-- data/maps/events/SafariZone_Northeast.inc | 12 +++---- data/maps/events/SeafloorCavern_Room1.inc | 6 ++-- data/maps/events/SeafloorCavern_Room2.inc | 18 +++++----- data/maps/events/SeafloorCavern_Room3.inc | 18 +++++----- data/maps/events/SeafloorCavern_Room5.inc | 12 +++---- data/maps/events/SeafloorCavern_Room8.inc | 24 ++++++------- data/maps/events/ShoalCave_LowTideLowerRoom.inc | 2 +- data/maps/events/VictoryRoad_B1F.inc | 28 +++++++-------- data/scripts/berry_tree.inc | 2 +- data/scripts/cable_club.inc | 2 +- data/scripts/day_care.inc | 2 +- data/scripts/maps/BattleTower_BattleRoom.inc | 4 +-- data/scripts/maps/IslandCave.inc | 2 +- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 2 +- data/scripts/maps/LilycoveCity_Harbor.inc | 2 +- .../maps/LilycoveCity_MoveDeletersHouse.inc | 6 ++-- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 2 +- data/scripts/maps/Route101.inc | 2 +- data/scripts/maps/Route110.inc | 2 +- data/scripts/maps/SlateportCity.inc | 2 +- data/scripts/players_house.inc | 2 +- data/specials.inc | 14 ++++---- 47 files changed, 263 insertions(+), 263 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 171581dd9..0a8390a8f 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1449,7 +1449,7 @@ do_heal_party:: @ 819FD7C checkanimation 25 move 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A0845 waitmove 0 - special HealPlayerParty + special ScrSpecial_HealPlayerParty checkflag 273 jumpif 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE jump OldaleTown_PokemonCenter_1F_EventScript_19FDB0 @@ -2106,7 +2106,7 @@ SSTidalRooms_EventScript_1A02CA:: @ 81A02CA fadescreen 1 fanfare 368 waitfanfare - special HealPlayerParty + special ScrSpecial_HealPlayerParty fadescreen 0 return @@ -4288,7 +4288,7 @@ SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A setvar 0x8005, 0 special sub_813556C waitstate - special HealPlayerParty + special ScrSpecial_HealPlayerParty release end @@ -4769,7 +4769,7 @@ gUnknown_081B694A:: @ 81B694A .include "data/scripts/players_house.inc" -Event_RunningShoesManual:: @ 81B6E5A +S_RunningShoesManual:: @ 81B6E5A msgbox UnknownString_81728E3, 3 end @@ -4778,7 +4778,7 @@ Event_RunningShoesManual:: @ 81B6E5A .include "data/text/trainers.inc" -Event_RepelWoreOff:: @ 81C33E6 +S_RepelWoreOff:: @ 81C33E6 msgbox Text_RepelWoreOff, 3 end @@ -4858,7 +4858,7 @@ GraniteCave_B1F_MapScript2_1C6BB5:: @ 81C6BB5 MtPyre_2F_MapScript2_1C6BB5:: @ 81C6BB5 SkyPillar_2F_MapScript2_1C6BB5:: @ 81C6BB5 SkyPillar_4F_MapScript2_1C6BB5:: @ 81C6BB5 - map_script_2 0x4022, 0, GraniteCave_B1F_EventScript_1C6BC5 + map_script_2 0x4022, 0, S_FallDownHole .2byte 0 GraniteCave_B1F_MapScript1_1C6BBF:: @ 81C6BBF @@ -4868,7 +4868,7 @@ SkyPillar_4F_MapScript1_1C6BBF:: @ 81C6BBF copyvar 0x4022, 0x1 end -GraniteCave_B1F_EventScript_1C6BC5:: @ 81C6BC5 +S_FallDownHole:: @ 81C6BC5 lockall pause 20 move 255, GraniteCave_B1F_Movement_1C6BF7 diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index acf5e9e17..9911dca3a 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -1,4 +1,4 @@ -CuttableTreeScript:: @ 81B0DCC +S_CuttableTree:: @ 81B0DCC lockall checkflag 2055 jumpif 0, CannotUseCut @@ -18,7 +18,7 @@ CuttableTreeScript:: @ 81B0DCC jump DoTreeCutMovement end -UseCutScript:: @ 81B0E16 +S_UseCut:: @ 81B0E16 lockall doanimation 2 waitstate @@ -56,7 +56,7 @@ UsedCutRockSmashText: @ 81B0E82 CannotUseCutText: @ 81B0E8E .string "This tree looks like it can be CUT down.$" -BreakableRockScript:: @ 81B0EB7 +S_BreakableRock:: @ 81B0EB7 lockall checkflag 2057 jumpif 0, CannotUseRockSmash @@ -76,7 +76,7 @@ BreakableRockScript:: @ 81B0EB7 jump DoRockSmashMovement end -UseRockSmashScript:: @ 81B0F01 +S_UseRockSmash:: @ 81B0F01 lockall doanimation 37 waitstate @@ -123,7 +123,7 @@ CannotUseRockSmashText: @ 81B0F90 .string "It’s a rugged rock, but a POKéMON\n" .string "may be able to smash it.$" -PushableBoulderScript:: @ 81B0FCB +S_PushableBoulder:: @ 81B0FCB lockall checkflag 2058 jumpif 0, CannotUseStrength @@ -142,7 +142,7 @@ PushableBoulderScript:: @ 81B0FCB jump UsedStrength end -UseStrengthScript:: @ 81B100E +S_UseStrength:: @ 81B100E lockall doanimation 40 waitstate @@ -188,7 +188,7 @@ AlreadyUsedStrengthText: @ 81B1127 .string "STRENGTH made it possible to move\n" .string "boulders around.$" -UseWaterfallScript:: @ 81B115A +S_UseWaterfall:: @ 81B115A lockall checkattack MOVE_WATERFALL compare RESULT, 6 @@ -202,7 +202,7 @@ UseWaterfallScript:: @ 81B115A doanimation 43 jump Waterfall_Done -CannotUseWaterfallScript:: @ 81B1194 +S_CannotUseWaterfall:: @ 81B1194 lockall Waterfall_NoMonKnows: @ 81B1195 msgbox CannotUseWaterfallText, 4 @@ -244,7 +244,7 @@ Dive_Done: @ 81B1267 releaseall end -UnderwaterUseDiveScript:: @ 81B1269 +S_UseDiveUnderwater:: @ 81B1269 lockall checkattack MOVE_DIVE compare RESULT, 6 diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc index 01b7b3efe..a4ac688d8 100644 --- a/data/maps/events/FieryPath.inc +++ b/data/maps/events/FieryPath.inc @@ -1,11 +1,11 @@ FieryPath_MapObjects:: @ 838C718 object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17EE, 1091, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 32, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17E1, 1111, 0, 0 FieryPath_MapWarps:: @ 838C7D8 diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/events/GraniteCave_B2F.inc index 49c0bace0..158577482 100644 --- a/data/maps/events/GraniteCave_B2F.inc +++ b/data/maps/events/GraniteCave_B2F.inc @@ -1,13 +1,13 @@ GraniteCave_B2F_MapObjects:: @ 838BFEC object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, 1053, 0, 0 object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, 1054, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 20, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 22, 0, 0 - object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 23, 0, 0 + object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0 + object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0 + object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 23, 0, 0 GraniteCave_B2F_MapWarps:: @ 838C0C4 warp_def 29, 13, 3, 2, GraniteCave_B1F diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc index 0ec69c1a2..cb0ff7ca1 100644 --- a/data/maps/events/PetalburgWoods.inc +++ b/data/maps/events/PetalburgWoods.inc @@ -1,6 +1,6 @@ PetalburgWoods_MapObjects:: @ 838C14C - object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0 + object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 object_event 3, 241, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 725, 0, 0 object_event 4, MAP_OBJ_GFX_MAN_2, 0, 26, 0, 20, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 724, 0, 0 object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 45, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, 1056, 0, 0 diff --git a/data/maps/events/Route102.inc b/data/maps/events/Route102.inc index 9cf97de4b..7ffa0e191 100644 --- a/data/maps/events/Route102.inc +++ b/data/maps/events/Route102.inc @@ -5,8 +5,8 @@ Route102_MapObjects:: @ 83811FC object_event 4, MAP_OBJ_GFX_LASS, 0, 8, 0, 7, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route102_EventScript_14EB53, 0, 0, 0 object_event 5, MAP_OBJ_GFX_BOY_1, 0, 37, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route102_EventScript_14EAF5, 0, 0, 0 object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 15, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route102_EventScript_1B1439, 1000, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 2, 0, 3, 12, 0, 0, 0, 0, 2, 0, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 2, 0, 3, 12, 0, 0, 0, 0, 1, 0, BerryTreeScript, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 2, 0, 3, 12, 0, 0, 0, 0, 2, 0, S_BerryTree, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 2, 0, 3, 12, 0, 0, 0, 0, 1, 0, S_BerryTree, 0, 0, 0 object_event 9, MAP_OBJ_GFX_YOUNGSTER, 0, 19, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route102_EventScript_14EB6A, 0, 0, 0 Route102_MapBGEvents:: @ 83812D4 diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc index 01640eb65..462fe1a3b 100644 --- a/data/maps/events/Route103.inc +++ b/data/maps/events/Route103.inc @@ -5,15 +5,15 @@ Route103_MapObjects:: @ 8381300 object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDF1, 0, 0, 0 object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDAB, 0, 0, 0 object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 50, 0, 8, 0, 3, 26, 16, 0, 1, 0, 3, 0, Route103_EventScript_14EE37, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 58, 0, 5, 0, 3, 12, 0, 0, 0, 0, 5, 0, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 59, 0, 5, 0, 3, 12, 0, 0, 0, 0, 6, 0, BerryTreeScript, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 60, 0, 5, 0, 3, 12, 0, 0, 0, 0, 7, 0, BerryTreeScript, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 58, 0, 5, 0, 3, 12, 0, 0, 0, 0, 5, 0, S_BerryTree, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 59, 0, 5, 0, 3, 12, 0, 0, 0, 0, 6, 0, S_BerryTree, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 60, 0, 5, 0, 3, 12, 0, 0, 0, 0, 7, 0, S_BerryTree, 0, 0, 0 object_event 10, MAP_OBJ_GFX_BOY_1, 0, 20, 0, 10, 0, 3, 2, 33, 0, 0, 0, 0, 0, Route103_EventScript_14ED79, 0, 0, 0 object_event 11, MAP_OBJ_GFX_PROF_BIRCH, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route103_EventScript_1A037F, 898, 0, 0 object_event 12, MAP_OBJ_GFX_MAN_3, 0, 56, 0, 12, 0, 3, 10, 0, 0, 1, 0, 5, 0, Route103_EventScript_14EE4E, 0, 0, 0 object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 63, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route103_EventScript_1B1446, 1114, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0 + object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 Route103_MapBGEvents:: @ 8381468 bg_event 11, 9, 0, 0, 0, Route103_EventScript_14ED8B diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc index da4b5ffc1..b4c8a2834 100644 --- a/data/maps/events/Route104.inc +++ b/data/maps/events/Route104.inc @@ -8,17 +8,17 @@ Route104_MapObjects:: @ 8381488 object_event 7, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 54, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, 742, 0, 0 object_event 8, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 51, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, 738, 0, 0 object_event 9, MAP_OBJ_GFX_FISHERMAN, 0, 29, 0, 8, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F172, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 6, 0, 3, 12, 0, 0, 0, 0, 8, 0, BerryTreeScript, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 6, 0, 3, 12, 0, 0, 0, 0, 9, 0, BerryTreeScript, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 6, 0, 3, 12, 0, 0, 0, 0, 10, 0, BerryTreeScript, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 41, 0, 3, 12, 0, 0, 0, 0, 11, 0, BerryTreeScript, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 41, 0, 3, 12, 0, 0, 0, 0, 12, 0, BerryTreeScript, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 41, 0, 3, 12, 0, 0, 0, 0, 13, 0, BerryTreeScript, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 6, 0, 3, 12, 0, 0, 0, 0, 8, 0, S_BerryTree, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 6, 0, 3, 12, 0, 0, 0, 0, 9, 0, S_BerryTree, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 6, 0, 3, 12, 0, 0, 0, 0, 10, 0, S_BerryTree, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 41, 0, 3, 12, 0, 0, 0, 0, 11, 0, S_BerryTree, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 41, 0, 3, 12, 0, 0, 0, 0, 12, 0, S_BerryTree, 0, 0, 0 + object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 41, 0, 3, 12, 0, 0, 0, 0, 13, 0, S_BerryTree, 0, 0, 0 object_event 16, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 37, 0, 8, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EEC8, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 22, 0, 3, 12, 0, 0, 0, 0, 3, 0, BerryTreeScript, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 23, 0, 3, 12, 0, 0, 0, 0, 4, 0, BerryTreeScript, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 24, 0, 3, 12, 0, 0, 0, 0, 75, 0, BerryTreeScript, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 25, 0, 3, 12, 0, 0, 0, 0, 76, 0, BerryTreeScript, 0, 0, 0 + object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 22, 0, 3, 12, 0, 0, 0, 0, 3, 0, S_BerryTree, 0, 0, 0 + object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 23, 0, 3, 12, 0, 0, 0, 0, 4, 0, S_BerryTree, 0, 0, 0 + object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 24, 0, 3, 12, 0, 0, 0, 0, 75, 0, S_BerryTree, 0, 0, 0 + object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 25, 0, 3, 12, 0, 0, 0, 0, 76, 0, S_BerryTree, 0, 0, 0 object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route104_EventScript_1B1453, 1002, 0, 0 object_event 22, MAP_OBJ_GFX_WOMAN_7, 0, 8, 0, 19, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route104_EventScript_14EF09, 906, 0, 0 object_event 23, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F25A, 0, 0, 0 @@ -28,7 +28,7 @@ Route104_MapObjects:: @ 8381488 object_event 27, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B1460, 1057, 0, 0 object_event 28, MAP_OBJ_GFX_YOUNGSTER, 0, 18, 0, 67, 0, 3, 46, 101, 0, 1, 0, 2, 0, Route104_EventScript_14F189, 0, 0, 0 object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B146D, 1115, 0, 0 - object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 + object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 object_event 31, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B147A, 1135, 0, 0 object_event 32, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF93, 0, 0, 0 diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc index 4ece25549..3db4ce8e8 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/events/Route110.inc @@ -14,9 +14,9 @@ Route110_MapObjects:: @ 8381D58 object_event 13, MAP_OBJ_GFX_LASS, 0, 33, 0, 15, 0, 3, 9, 0, 0, 1, 0, 1, 0, Route110_EventScript_14FAA5, 0, 0, 0 object_event 14, MAP_OBJ_GFX_MANIAC, 0, 23, 0, 40, 0, 3, 20, 0, 0, 1, 0, 3, 0, Route110_EventScript_14FABC, 0, 0, 0 object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 10, 0, 19, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_EventScript_14FAFA, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 11, 0, 3, 12, 0, 0, 0, 0, 16, 0, BerryTreeScript, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 11, 0, 3, 12, 0, 0, 0, 0, 17, 0, BerryTreeScript, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 11, 0, 3, 12, 0, 0, 0, 0, 18, 0, BerryTreeScript, 0, 0, 0 + object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 11, 0, 3, 12, 0, 0, 0, 0, 16, 0, S_BerryTree, 0, 0, 0 + object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 11, 0, 3, 12, 0, 0, 0, 0, 17, 0, S_BerryTree, 0, 0, 0 + object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 11, 0, 3, 12, 0, 0, 0, 0, 18, 0, S_BerryTree, 0, 0, 0 object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 69, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14BB, 1007, 0, 0 object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14AE, 1006, 0, 0 object_event 21, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 0, 92, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_EventScript_14FA53, 0, 0, 0 diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/events/Route110_TrickHousePuzzle1.inc index 7e282f0e8..3660e3c3f 100644 --- a/data/maps/events/Route110_TrickHousePuzzle1.inc +++ b/data/maps/events/Route110_TrickHousePuzzle1.inc @@ -2,22 +2,22 @@ Route110_TrickHousePuzzle1_MapObjects:: @ 839225C object_event 1, MAP_OBJ_GFX_LASS, 0, 13, 0, 21, 0, 3, 9, 0, 0, 1, 0, 5, 0, Route110_TrickHousePuzzle1_EventScript_161D31, 0, 0, 0 object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 13, 0, 7, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle1_EventScript_161D48, 0, 0, 0 object_event 3, MAP_OBJ_GFX_LASS, 0, 3, 0, 8, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route110_TrickHousePuzzle1_EventScript_161D5F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0 - object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 7, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 - object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0 - object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 10, 0, 16, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 20, 0, 0 - object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 23, 0, 0 - object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 22, 0, 0 - object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 21, 0, 0 - object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 25, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 24, 0, 0 - object_event 13, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 9, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 26, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 28, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 27, 0, 0 - object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 29, 0, 0 - object_event 17, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 30, 0, 0 + object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 + object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 7, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 + object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 + object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 10, 0, 16, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 20, 0, 0 + object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 23, 0, 0 + object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 22, 0, 0 + object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 21, 0, 0 + object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 25, 0, 0 + object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 24, 0, 0 + object_event 13, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 9, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 26, 0, 0 + object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 28, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 27, 0, 0 + object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 29, 0, 0 + object_event 17, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 30, 0, 0 object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, 1060, 0, 0 - object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 31, 0, 0 + object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 31, 0, 0 Route110_TrickHousePuzzle1_MapWarps:: @ 8392424 warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc index b7a902a54..abccae1d4 100644 --- a/data/maps/events/Route110_TrickHousePuzzle3.inc +++ b/data/maps/events/Route110_TrickHousePuzzle3.inc @@ -2,14 +2,14 @@ Route110_TrickHousePuzzle3_MapObjects:: @ 839254C object_event 1, MAP_OBJ_GFX_CAMPER, 0, 10, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162708, 0, 0, 0 object_event 2, MAP_OBJ_GFX_PICNICKER, 0, 1, 0, 13, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_16271F, 0, 0, 0 object_event 3, MAP_OBJ_GFX_HIKER, 0, 11, 0, 4, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162736, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 20, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0 + object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, 1064, 0, 0 object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, 1063, 0, 0 - object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0 - object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 22, 0, 0 + object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0 + object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0 Route110_TrickHousePuzzle3_MapWarps:: @ 8392654 warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/events/Route110_TrickHousePuzzle4.inc index ac3e152a2..ef450800d 100644 --- a/data/maps/events/Route110_TrickHousePuzzle4.inc +++ b/data/maps/events/Route110_TrickHousePuzzle4.inc @@ -3,17 +3,17 @@ Route110_TrickHousePuzzle4_MapObjects:: @ 83926FC object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 4, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle4_EventScript_162799, 0, 0, 0 object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 7, 0, 4, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle4_EventScript_162782, 0, 0, 0 object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, 1065, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0 - object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0 - object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0 - object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 24, 0, 0 - object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 25, 0, 0 - object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 26, 0, 0 - object_event 15, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 27, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 + object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0 + object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 + object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0 + object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 24, 0, 0 + object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 25, 0, 0 + object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 26, 0, 0 + object_event 15, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 27, 0, 0 Route110_TrickHousePuzzle4_MapWarps:: @ 8392864 warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc index 9eeed5ede..e36cd7e74 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -4,8 +4,8 @@ Route111_MapObjects:: @ 83821A0 object_event 3, MAP_OBJ_GFX_LASS, 0, 13, 0, 113, 0, 0, 8, 1, 0, 0, 0, 0, 0, 0x0, 770, 0, 0 object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 771, 0, 0 object_event 5, MAP_OBJ_GFX_PICNICKER, 0, 28, 0, 51, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503BE, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 5, 0, 3, 12, 0, 0, 0, 0, 19, 0, BerryTreeScript, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 5, 0, 3, 12, 0, 0, 0, 0, 20, 0, BerryTreeScript, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 5, 0, 3, 12, 0, 0, 0, 0, 19, 0, S_BerryTree, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 5, 0, 3, 12, 0, 0, 0, 0, 20, 0, S_BerryTree, 0, 0, 0 object_event 8, MAP_OBJ_GFX_MAN_4, 0, 8, 0, 91, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route111_EventScript_150395, 0, 0, 0 object_event 9, MAP_OBJ_GFX_CAMPER, 0, 24, 0, 60, 0, 3, 21, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503A7, 0, 0, 0 object_event 10, MAP_OBJ_GFX_HIKER, 0, 27, 0, 69, 0, 3, 50, 34, 0, 1, 0, 2, 0, Route111_EventScript_150403, 0, 0, 0 @@ -13,19 +13,19 @@ Route111_MapObjects:: @ 83821A0 object_event 12, MAP_OBJ_GFX_PICNICKER, 0, 32, 0, 72, 0, 3, 24, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503EC, 0, 0, 0 object_event 13, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE442, 796, 0, 0 object_event 14, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE422, 796, 0, 0 - object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0 - object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0 + object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 + object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0 object_event 17, MAP_OBJ_GFX_GIRL_1, 0, 23, 0, 8, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route111_EventScript_1500C5, 0, 0, 0 object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 105, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14C8, 1008, 0, 0 - object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 80, 0, BerryTreeScript, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 5, 0, 3, 12, 0, 0, 0, 0, 81, 0, BerryTreeScript, 0, 0, 0 + object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 80, 0, S_BerryTree, 0, 0, 0 + object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 5, 0, 3, 12, 0, 0, 0, 0, 81, 0, S_BerryTree, 0, 0, 0 object_event 21, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE4E2, 799, 0, 0 object_event 22, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE502, 799, 0, 0 object_event 23, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE562, 903, 0, 0 object_event 24, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE582, 903, 0, 0 object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 54, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14D5, 1009, 0, 0 object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 114, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14E2, 1010, 0, 0 - object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0 + object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 object_event 28, MAP_OBJ_GFX_PICNICKER, 0, 10, 0, 82, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route111_EventScript_150458, 0, 0, 0 object_event 29, MAP_OBJ_GFX_CAMPER, 0, 11, 0, 71, 0, 3, 22, 0, 0, 1, 0, 3, 0, Route111_EventScript_150441, 0, 0, 0 object_event 30, MAP_OBJ_GFX_BLACK_BELT, 0, 32, 0, 29, 0, 3, 28, 1, 0, 1, 0, 2, 0, Route111_EventScript_15046F, 0, 0, 0 diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc index f6dfcfbe5..a4991a907 100644 --- a/data/maps/events/Route112.inc +++ b/data/maps/events/Route112.inc @@ -5,10 +5,10 @@ Route112_MapObjects:: @ 8382818 object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 22, 0, 46, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route112_EventScript_1505B5, 0, 0, 0 object_event 5, MAP_OBJ_GFX_HIKER, 0, 17, 0, 40, 0, 3, 16, 0, 0, 1, 0, 4, 0, Route112_EventScript_150560, 0, 0, 0 object_event 6, 241, 0, 27, 0, 30, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_EventScript_15051C, 819, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 27, 0, 6, 0, 0, 12, 0, 0, 0, 0, 24, 0, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 28, 0, 6, 0, 0, 12, 0, 0, 0, 0, 23, 0, BerryTreeScript, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 6, 0, 0, 12, 0, 0, 0, 0, 22, 0, BerryTreeScript, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 6, 0, 3, 12, 0, 0, 0, 0, 21, 0, BerryTreeScript, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 27, 0, 6, 0, 0, 12, 0, 0, 0, 0, 24, 0, S_BerryTree, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 28, 0, 6, 0, 0, 12, 0, 0, 0, 0, 23, 0, S_BerryTree, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 6, 0, 0, 12, 0, 0, 0, 0, 22, 0, S_BerryTree, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 6, 0, 3, 12, 0, 0, 0, 0, 21, 0, S_BerryTree, 0, 0, 0 object_event 11, MAP_OBJ_GFX_HIKER, 0, 8, 0, 50, 0, 3, 26, 48, 0, 0, 0, 0, 0, Route112_EventScript_150540, 0, 0, 0 object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 43, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route112_EventScript_1B14EF, 1011, 0, 0 diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc index a2d948d33..1f4d761e3 100644 --- a/data/maps/events/Route114.inc +++ b/data/maps/events/Route114.inc @@ -1,25 +1,25 @@ Route114_MapObjects:: @ 8382C48 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 43, 0, 3, 12, 0, 0, 0, 0, 77, 0, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 44, 0, 3, 12, 0, 0, 0, 0, 78, 0, BerryTreeScript, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 43, 0, 3, 12, 0, 0, 0, 0, 77, 0, S_BerryTree, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 44, 0, 3, 12, 0, 0, 0, 0, 78, 0, S_BerryTree, 0, 0, 0 object_event 3, MAP_OBJ_GFX_HIKER, 0, 15, 0, 65, 0, 7, 10, 0, 0, 1, 0, 6, 0, Route114_EventScript_1507F1, 0, 0, 0 object_event 4, MAP_OBJ_GFX_HIKER, 0, 30, 0, 72, 0, 5, 15, 0, 0, 1, 0, 4, 0, Route114_EventScript_150808, 0, 0, 0 object_event 5, MAP_OBJ_GFX_CAMPER, 0, 22, 0, 50, 0, 3, 10, 0, 0, 1, 0, 3, 0, Route114_EventScript_15081F, 0, 0, 0 object_event 6, MAP_OBJ_GFX_PICNICKER, 0, 19, 0, 35, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route114_EventScript_150836, 0, 0, 0 object_event 7, MAP_OBJ_GFX_MANIAC, 0, 20, 0, 56, 0, 3, 7, 0, 0, 1, 0, 3, 0, Route114_EventScript_15084D, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 45, 0, 3, 12, 0, 0, 0, 0, 68, 0, BerryTreeScript, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 45, 0, 3, 12, 0, 0, 0, 0, 68, 0, S_BerryTree, 0, 0, 0 object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1516, 1014, 0, 0 object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 37, 0, 4, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1523, 1015, 0, 0 - object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0 + object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 object_event 12, MAP_OBJ_GFX_GENTLEMAN, 0, 19, 0, 11, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_150782, 0, 0, 0 object_event 13, MAP_OBJ_GFX_POOCHYENA, 0, 19, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_1507C3, 0, 0, 0 object_event 14, MAP_OBJ_GFX_MAN_5, 0, 27, 0, 42, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route114_EventScript_150733, 0, 0, 0 object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 23, 0, 20, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508E0, 0, 0, 0 object_event 16, MAP_OBJ_GFX_FISHERMAN, 0, 19, 0, 26, 0, 3, 9, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508C9, 0, 0, 0 object_event 17, MAP_OBJ_GFX_MAN_6, 0, 30, 0, 58, 0, 5, 23, 0, 0, 1, 0, 3, 0, Route114_EventScript_15088B, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 53, 0, 5, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0 - object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 0, 54, 0, 5, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0 - object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 0, 69, 0, 7, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 20, 0, 0 - object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 64, 0, 5, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0 + object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 53, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0 + object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 0, 54, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0 + object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 0, 69, 0, 7, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0 + object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 64, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0 object_event 22, MAP_OBJ_GFX_LASS, 0, 24, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_150912, 0, 0, 0 object_event 23, MAP_OBJ_GFX_LASS, 0, 23, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_1508F7, 0, 0, 0 diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc index cba3c3e7d..ddca08fad 100644 --- a/data/maps/events/Route115.inc +++ b/data/maps/events/Route115.inc @@ -2,18 +2,18 @@ Route115_MapObjects:: @ 8382F2C object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 18, 0, 68, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route115_EventScript_15092E, 0, 0, 0 object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 15, 0, 3, 10, 0, 0, 1, 0, 6, 0, Route115_EventScript_150949, 0, 0, 0 object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 27, 0, 53, 0, 3, 15, 17, 0, 1, 0, 4, 0, Route115_EventScript_15099E, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 69, 0, BerryTreeScript, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 70, 0, BerryTreeScript, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 13, 0, 5, 0, 3, 12, 0, 0, 0, 0, 71, 0, BerryTreeScript, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 69, 0, S_BerryTree, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 70, 0, S_BerryTree, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 13, 0, 5, 0, 3, 12, 0, 0, 0, 0, 71, 0, S_BerryTree, 0, 0, 0 object_event 7, MAP_OBJ_GFX_GIRL_3, 0, 15, 0, 50, 0, 3, 64, 0, 0, 1, 0, 3, 0, Route115_EventScript_1509DC, 0, 0, 0 object_event 8, MAP_OBJ_GFX_BLACK_BELT, 0, 17, 0, 17, 0, 3, 50, 51, 0, 1, 0, 2, 0, Route115_EventScript_150987, 0, 0, 0 object_event 9, MAP_OBJ_GFX_MANIAC, 0, 25, 0, 61, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route115_EventScript_150A1A, 0, 0, 0 object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 60, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B1530, 1016, 0, 0 object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B153D, 1017, 0, 0 object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B154A, 1018, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 64, 0, 3, 12, 0, 0, 0, 0, 55, 0, BerryTreeScript, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 65, 0, 3, 12, 0, 0, 0, 0, 56, 0, BerryTreeScript, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0 + object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 64, 0, 3, 12, 0, 0, 0, 0, 55, 0, S_BerryTree, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 65, 0, 3, 12, 0, 0, 0, 0, 56, 0, S_BerryTree, 0, 0, 0 + object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route115_EventScript_1B1557, 1118, 0, 0 Route115_MapWarps:: @ 83830AC diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc index 18717be4e..b5f922524 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -1,18 +1,18 @@ Route116_MapObjects:: @ 8383170 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 2, 0, 3, 12, 0, 0, 0, 0, 25, 0, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 2, 0, 3, 12, 0, 0, 0, 0, 26, 0, BerryTreeScript, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 2, 0, 3, 12, 0, 0, 0, 0, 25, 0, S_BerryTree, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 2, 0, 3, 12, 0, 0, 0, 0, 26, 0, S_BerryTree, 0, 0, 0 object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 12, 0, 7, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route116_EventScript_150C62, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 21, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 - object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0 + object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 21, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 + object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 object_event 6, MAP_OBJ_GFX_BUG_CATCHER, 0, 13, 0, 17, 0, 3, 24, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C79, 0, 0, 0 object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B1571, 1019, 0, 0 object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B157E, 1020, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 20, 0, 2, 0, 3, 12, 0, 0, 0, 0, 66, 0, BerryTreeScript, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 21, 0, 2, 0, 3, 12, 0, 0, 0, 0, 67, 0, BerryTreeScript, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 20, 0, 2, 0, 3, 12, 0, 0, 0, 0, 66, 0, S_BerryTree, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 21, 0, 2, 0, 3, 12, 0, 0, 0, 0, 67, 0, S_BerryTree, 0, 0, 0 object_event 11, MAP_OBJ_GFX_OLD_MAN_1, 0, 46, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_150B5D, 891, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0 + object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 object_event 13, MAP_OBJ_GFX_HIKER, 0, 36, 0, 15, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CCE, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 20, 0, 0 + object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 20, 0, 0 object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 80, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B158B, 1021, 0, 0 object_event 16, MAP_OBJ_GFX_LASS, 0, 22, 0, 16, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route116_EventScript_150CE5, 0, 0, 0 object_event 17, MAP_OBJ_GFX_GIRL_3, 0, 25, 0, 4, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CFC, 0, 0, 0 diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc index b53e3de57..bf6aeb5d0 100644 --- a/data/maps/events/Route117.inc +++ b/data/maps/events/Route117.inc @@ -9,11 +9,11 @@ Route117_MapObjects:: @ 8383440 object_event 8, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 35, 0, 7, 0, 3, 28, 7, 0, 1, 0, 4, 0, Route117_EventScript_150E09, 0, 0, 0 object_event 9, MAP_OBJ_GFX_WOMAN_3, 0, 31, 0, 11, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route117_EventScript_150DCB, 0, 0, 0 object_event 10, MAP_OBJ_GFX_MAN_5, 0, 10, 0, 9, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route117_EventScript_150D8D, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 41, 0, 13, 0, 3, 12, 0, 0, 0, 0, 29, 0, BerryTreeScript, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 42, 0, 13, 0, 3, 12, 0, 0, 0, 0, 28, 0, BerryTreeScript, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 43, 0, 13, 0, 3, 12, 0, 0, 0, 0, 27, 0, BerryTreeScript, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 41, 0, 13, 0, 3, 12, 0, 0, 0, 0, 29, 0, S_BerryTree, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 42, 0, 13, 0, 3, 12, 0, 0, 0, 0, 28, 0, S_BerryTree, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 43, 0, 13, 0, 3, 12, 0, 0, 0, 0, 27, 0, S_BerryTree, 0, 0, 0 object_event 14, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B1598, 1022, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B15A5, 1023, 0, 0 object_event 17, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 21, 0, 1, 0, 3, 40, 68, 0, 1, 0, 3, 0, Route117_EventScript_150E47, 0, 0, 0 object_event 18, MAP_OBJ_GFX_MANIAC, 0, 17, 0, 12, 0, 3, 7, 17, 0, 1, 0, 4, 0, Route117_EventScript_150E85, 0, 0, 0 diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc index f912b6fbd..df887ba1e 100644 --- a/data/maps/events/Route118.inc +++ b/data/maps/events/Route118.inc @@ -1,7 +1,7 @@ Route118_MapObjects:: @ 8383684 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 5, 0, 3, 12, 0, 0, 0, 0, 31, 0, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 5, 0, 3, 12, 0, 0, 0, 0, 32, 0, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 37, 0, 5, 0, 3, 12, 0, 0, 0, 0, 33, 0, BerryTreeScript, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 5, 0, 3, 12, 0, 0, 0, 0, 31, 0, S_BerryTree, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 5, 0, 3, 12, 0, 0, 0, 0, 32, 0, S_BerryTree, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 37, 0, 5, 0, 3, 12, 0, 0, 0, 0, 33, 0, S_BerryTree, 0, 0, 0 object_event 4, MAP_OBJ_GFX_MAN_6, 0, 64, 0, 10, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route118_EventScript_151139, 0, 0, 0 object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE462, 797, 0, 0 object_event 6, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE482, 797, 0, 0 @@ -10,7 +10,7 @@ Route118_MapObjects:: @ 8383684 object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE542, 901, 0, 0 object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE562, 904, 0, 0 object_event 11, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE582, 904, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 + object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 28, 0, 8, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route118_EventScript_150F34, 0, 0, 0 object_event 14, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 10, 0, 3, 24, 0, 0, 1, 0, 4, 0, Route118_EventScript_15108F, 0, 0, 0 object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 14, 0, 14, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route118_EventScript_1510E4, 0, 0, 0 diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index 966ae6058..08e6e3649 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -1,7 +1,7 @@ Route119_MapObjects:: @ 8383914 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 5, 0, 3, 12, 0, 0, 0, 0, 34, 0, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 5, 0, 3, 12, 0, 0, 0, 0, 35, 0, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 26, 0, 5, 0, 3, 12, 0, 0, 0, 0, 36, 0, BerryTreeScript, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 5, 0, 3, 12, 0, 0, 0, 0, 34, 0, S_BerryTree, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 5, 0, 3, 12, 0, 0, 0, 0, 35, 0, S_BerryTree, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 26, 0, 5, 0, 3, 12, 0, 0, 0, 0, 36, 0, S_BerryTree, 0, 0, 0 object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 12, 0, 123, 0, 3, 59, 0, 0, 1, 0, 1, 0, Route119_EventScript_151491, 0, 0, 0 object_event 5, MAP_OBJ_GFX_MANIAC, 0, 26, 0, 123, 0, 3, 60, 0, 0, 1, 0, 1, 0, Route119_EventScript_151463, 0, 0, 0 object_event 6, MAP_OBJ_GFX_MANIAC, 0, 5, 0, 125, 0, 3, 62, 0, 0, 1, 0, 1, 0, Route119_EventScript_15144C, 0, 0, 0 @@ -25,10 +25,10 @@ Route119_MapObjects:: @ 8383914 object_event 24, 241, 0, 13, 0, 34, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515DC, 890, 0, 0 object_event 25, 243, 0, 17, 0, 33, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0x0, 923, 0, 0 object_event 26, MAP_OBJ_GFX_BOY_3, 0, 31, 0, 109, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515F3, 0, 0, 0 - object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 8, 0, 23, 0, 3, 12, 0, 0, 0, 0, 83, 0, BerryTreeScript, 0, 0, 0 - object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 23, 0, 3, 12, 0, 0, 0, 0, 84, 0, BerryTreeScript, 0, 0, 0 - object_event 29, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 90, 0, 3, 12, 0, 0, 0, 0, 85, 0, BerryTreeScript, 0, 0, 0 - object_event 30, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 90, 0, 3, 12, 0, 0, 0, 0, 86, 0, BerryTreeScript, 0, 0, 0 + object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 8, 0, 23, 0, 3, 12, 0, 0, 0, 0, 83, 0, S_BerryTree, 0, 0, 0 + object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 23, 0, 3, 12, 0, 0, 0, 0, 84, 0, S_BerryTree, 0, 0, 0 + object_event 29, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 90, 0, 3, 12, 0, 0, 0, 0, 85, 0, S_BerryTree, 0, 0, 0 + object_event 30, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 90, 0, 3, 12, 0, 0, 0, 0, 86, 0, S_BerryTree, 0, 0, 0 object_event 31, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 0, 133, 0, 3, 5, 18, 0, 0, 0, 0, 0, Route119_EventScript_15141A, 0, 0, 0 object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route119_EventScript_1B160D, 1106, 0, 0 object_event 33, MAP_OBJ_GFX_BOY_2, 0, 35, 0, 93, 0, 4, 2, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515FC, 0, 0, 0 diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc index 43a67ee99..81fa21c7f 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -1,14 +1,14 @@ Route120_MapObjects:: @ 8383F30 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 4, 0, 79, 0, 3, 12, 0, 0, 0, 0, 46, 0, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 79, 0, 3, 12, 0, 0, 0, 0, 45, 0, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 79, 0, 3, 12, 0, 0, 0, 0, 44, 0, BerryTreeScript, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 79, 0, 3, 12, 0, 0, 0, 0, 43, 0, BerryTreeScript, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 24, 0, 3, 12, 0, 0, 0, 0, 37, 0, BerryTreeScript, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 24, 0, 3, 12, 0, 0, 0, 0, 38, 0, BerryTreeScript, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 24, 0, 3, 12, 0, 0, 0, 0, 39, 0, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 92, 0, 5, 12, 0, 0, 0, 0, 40, 0, BerryTreeScript, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 10, 0, 92, 0, 5, 12, 0, 0, 0, 0, 41, 0, BerryTreeScript, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 92, 0, 5, 12, 0, 0, 0, 0, 42, 0, BerryTreeScript, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 4, 0, 79, 0, 3, 12, 0, 0, 0, 0, 46, 0, S_BerryTree, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 79, 0, 3, 12, 0, 0, 0, 0, 45, 0, S_BerryTree, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 79, 0, 3, 12, 0, 0, 0, 0, 44, 0, S_BerryTree, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 79, 0, 3, 12, 0, 0, 0, 0, 43, 0, S_BerryTree, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 24, 0, 3, 12, 0, 0, 0, 0, 37, 0, S_BerryTree, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 24, 0, 3, 12, 0, 0, 0, 0, 38, 0, S_BerryTree, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 24, 0, 3, 12, 0, 0, 0, 0, 39, 0, S_BerryTree, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 92, 0, 5, 12, 0, 0, 0, 0, 40, 0, S_BerryTree, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 10, 0, 92, 0, 5, 12, 0, 0, 0, 0, 41, 0, S_BerryTree, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 92, 0, 5, 12, 0, 0, 0, 0, 42, 0, S_BerryTree, 0, 0, 0 object_event 11, MAP_OBJ_GFX_MAN_6, 0, 5, 0, 22, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route120_EventScript_1519B3, 0, 0, 0 object_event 12, MAP_OBJ_GFX_MAN_6, 0, 32, 0, 14, 0, 3, 10, 0, 0, 1, 0, 3, 0, Route120_EventScript_1519CA, 0, 0, 0 object_event 13, MAP_OBJ_GFX_CAMPER, 0, 27, 0, 51, 0, 3, 9, 0, 0, 1, 0, 7, 0, Route120_EventScript_151A08, 0, 0, 0 @@ -19,7 +19,7 @@ Route120_MapObjects:: @ 8383F30 object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4A2, 798, 0, 0 object_event 19, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE562, 902, 0, 0 object_event 20, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE582, 902, 0, 0 - object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 + object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 89, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B1627, 1031, 0, 0 object_event 23, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 92, 0, 5, 5, 1, 0, 0, 0, 0, 0, Route120_EventScript_151739, 0, 0, 0 object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 28, 0, 35, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route120_EventScript_151A74, 0, 0, 0 @@ -30,8 +30,8 @@ Route120_MapObjects:: @ 8383F30 object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 82, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1634, 1107, 0, 0 object_event 30, MAP_OBJ_GFX_KECLEON_1, 0, 12, 0, 16, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_151998, 970, 0, 0 object_event 31, MAP_OBJ_GFX_STEVEN, 0, 13, 0, 15, 0, 4, 8, 17, 0, 0, 0, 0, 0, Route120_EventScript_151853, 972, 0, 0 - object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 20, 0, 0 - object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0 + object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 20, 0, 0 + object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 10, 0, 72, 0, 3, 58, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AD0, 0, 0, 0 object_event 35, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 28, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AE7, 0, 0, 0 object_event 36, MAP_OBJ_GFX_KECLEON_2, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 981, 0, 0 diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc index 514f51349..9961344a8 100644 --- a/data/maps/events/Route121.inc +++ b/data/maps/events/Route121.inc @@ -1,26 +1,26 @@ Route121_MapObjects:: @ 8384504 object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 29, 0, 14, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route121_EventScript_151B0A, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 2, 0, 3, 12, 0, 0, 0, 0, 47, 0, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 2, 0, 3, 12, 0, 0, 0, 0, 48, 0, BerryTreeScript, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 16, 0, 2, 0, 3, 12, 0, 0, 0, 0, 49, 0, BerryTreeScript, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 2, 0, 3, 12, 0, 0, 0, 0, 50, 0, BerryTreeScript, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 64, 0, 14, 0, 3, 12, 0, 0, 0, 0, 51, 0, BerryTreeScript, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 65, 0, 14, 0, 3, 12, 0, 0, 0, 0, 52, 0, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 66, 0, 14, 0, 3, 12, 0, 0, 0, 0, 53, 0, BerryTreeScript, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 67, 0, 14, 0, 3, 12, 0, 0, 0, 0, 54, 0, BerryTreeScript, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 2, 0, 3, 12, 0, 0, 0, 0, 47, 0, S_BerryTree, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 2, 0, 3, 12, 0, 0, 0, 0, 48, 0, S_BerryTree, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 16, 0, 2, 0, 3, 12, 0, 0, 0, 0, 49, 0, S_BerryTree, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 2, 0, 3, 12, 0, 0, 0, 0, 50, 0, S_BerryTree, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 64, 0, 14, 0, 3, 12, 0, 0, 0, 0, 51, 0, S_BerryTree, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 65, 0, 14, 0, 3, 12, 0, 0, 0, 0, 52, 0, S_BerryTree, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 66, 0, 14, 0, 3, 12, 0, 0, 0, 0, 53, 0, S_BerryTree, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 67, 0, 14, 0, 3, 12, 0, 0, 0, 0, 54, 0, S_BerryTree, 0, 0, 0 object_event 10, MAP_OBJ_GFX_LASS, 0, 39, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BDE, 0, 0, 0 object_event 11, MAP_OBJ_GFX_LASS, 0, 40, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BF9, 0, 0, 0 object_event 12, 241, 0, 30, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0 object_event 13, 241, 0, 30, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0 object_event 14, 241, 0, 31, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 - object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 + object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 object_event 17, MAP_OBJ_GFX_WOMAN_2, 0, 63, 0, 5, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route121_EventScript_151B72, 0, 0, 0 object_event 18, MAP_OBJ_GFX_GENTLEMAN, 0, 55, 0, 8, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route121_EventScript_151B89, 0, 0, 0 object_event 19, MAP_OBJ_GFX_HEX_MANIAC, 0, 11, 0, 10, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route121_EventScript_151BC7, 0, 0, 0 object_event 20, MAP_OBJ_GFX_BEAUTY, 0, 22, 0, 5, 0, 3, 17, 0, 0, 1, 0, 4, 0, Route121_EventScript_151C14, 0, 0, 0 object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 55, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route121_EventScript_1B164E, 1103, 0, 0 - object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0 + object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 Route121_MapWarps:: @ 8384714 warp_def 37, 5, 0, 2, Route121_SafariZoneEntrance diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc index 6b97bafe5..dc5ac0fb4 100644 --- a/data/maps/events/Route123.inc +++ b/data/maps/events/Route123.inc @@ -1,30 +1,30 @@ Route123_MapObjects:: @ 83847F8 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 3, 0, 3, 12, 0, 0, 0, 0, 58, 0, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 3, 0, 3, 12, 0, 0, 0, 0, 59, 0, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 3, 0, 3, 12, 0, 0, 0, 0, 60, 0, BerryTreeScript, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 3, 0, 3, 12, 0, 0, 0, 0, 61, 0, BerryTreeScript, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 81, 0, 1, 0, 3, 12, 0, 0, 0, 0, 62, 0, BerryTreeScript, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 82, 0, 1, 0, 3, 12, 0, 0, 0, 0, 63, 0, BerryTreeScript, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 83, 0, 1, 0, 3, 12, 0, 0, 0, 0, 64, 0, BerryTreeScript, 0, 0, 0 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 3, 0, 3, 12, 0, 0, 0, 0, 58, 0, S_BerryTree, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 3, 0, 3, 12, 0, 0, 0, 0, 59, 0, S_BerryTree, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 3, 0, 3, 12, 0, 0, 0, 0, 60, 0, S_BerryTree, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 3, 0, 3, 12, 0, 0, 0, 0, 61, 0, S_BerryTree, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 81, 0, 1, 0, 3, 12, 0, 0, 0, 0, 62, 0, S_BerryTree, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 82, 0, 1, 0, 3, 12, 0, 0, 0, 0, 63, 0, S_BerryTree, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 83, 0, 1, 0, 3, 12, 0, 0, 0, 0, 64, 0, S_BerryTree, 0, 0, 0 object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 70, 0, 12, 0, 3, 24, 0, 0, 1, 0, 1, 0, Route123_EventScript_151CD1, 0, 0, 0 object_event 9, MAP_OBJ_GFX_MAN_4, 0, 58, 0, 7, 0, 3, 17, 0, 0, 1, 0, 2, 0, Route123_EventScript_151CE8, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 5, 0, 3, 12, 0, 0, 0, 0, 65, 0, BerryTreeScript, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 5, 0, 3, 12, 0, 0, 0, 0, 72, 0, BerryTreeScript, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 5, 0, 3, 12, 0, 0, 0, 0, 73, 0, BerryTreeScript, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 74, 0, BerryTreeScript, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 3, 0, 3, 12, 0, 0, 0, 0, 79, 0, BerryTreeScript, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 3, 0, 3, 12, 0, 0, 0, 0, 14, 0, BerryTreeScript, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 15, 0, BerryTreeScript, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 30, 0, BerryTreeScript, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 17, 0, 0 - object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 18, 0, 0 - object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, CuttableTreeScript, 19, 0, 0 + object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 5, 0, 3, 12, 0, 0, 0, 0, 65, 0, S_BerryTree, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 5, 0, 3, 12, 0, 0, 0, 0, 72, 0, S_BerryTree, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 5, 0, 3, 12, 0, 0, 0, 0, 73, 0, S_BerryTree, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 74, 0, S_BerryTree, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 3, 0, 3, 12, 0, 0, 0, 0, 79, 0, S_BerryTree, 0, 0, 0 + object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 3, 0, 3, 12, 0, 0, 0, 0, 14, 0, S_BerryTree, 0, 0, 0 + object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 15, 0, S_BerryTree, 0, 0, 0 + object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 30, 0, S_BerryTree, 0, 0, 0 + object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 17, 0, 0 + object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 18, 0, 0 + object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, 19, 0, 0 object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B165B, 1032, 0, 0 object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 139, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B1668, 1033, 0, 0 object_event 23, MAP_OBJ_GFX_GIRL_3, 0, 108, 0, 13, 0, 3, 15, 0, 0, 0, 0, 0, 0, Route123_EventScript_151C5D, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_BERRY_TREE, 0, 109, 0, 13, 0, 3, 12, 0, 0, 0, 0, 87, 0, BerryTreeScript, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_BERRY_TREE, 0, 110, 0, 13, 0, 3, 12, 0, 0, 0, 0, 88, 0, BerryTreeScript, 0, 0, 0 - object_event 26, MAP_OBJ_GFX_BERRY_TREE, 0, 111, 0, 13, 0, 3, 12, 0, 0, 0, 0, 89, 0, BerryTreeScript, 0, 0, 0 + object_event 24, MAP_OBJ_GFX_BERRY_TREE, 0, 109, 0, 13, 0, 3, 12, 0, 0, 0, 0, 87, 0, S_BerryTree, 0, 0, 0 + object_event 25, MAP_OBJ_GFX_BERRY_TREE, 0, 110, 0, 13, 0, 3, 12, 0, 0, 0, 0, 88, 0, S_BerryTree, 0, 0, 0 + object_event 26, MAP_OBJ_GFX_BERRY_TREE, 0, 111, 0, 13, 0, 3, 12, 0, 0, 0, 0, 89, 0, S_BerryTree, 0, 0, 0 object_event 27, MAP_OBJ_GFX_WOMAN_3, 0, 16, 0, 9, 0, 3, 23, 0, 0, 1, 0, 2, 0, Route123_EventScript_151CFF, 0, 0, 0 object_event 28, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route123_EventScript_151DAD, 0, 0, 0 object_event 29, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route123_EventScript_151D92, 0, 0, 0 diff --git a/data/maps/events/Route130.inc b/data/maps/events/Route130.inc index f2c72ef2d..009604d4b 100644 --- a/data/maps/events/Route130.inc +++ b/data/maps/events/Route130.inc @@ -1,7 +1,7 @@ Route130_MapObjects:: @ 838523C object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 7, 0, 26, 0, 1, 29, 99, 0, 1, 0, 3, 0, Route130_EventScript_152410, 0, 0, 0 object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 68, 0, 22, 0, 1, 13, 17, 0, 1, 0, 3, 0, Route130_EventScript_152427, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 52, 0, 9, 0, 3, 12, 0, 0, 0, 0, 82, 0, BerryTreeScript, 17, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 52, 0, 9, 0, 3, 12, 0, 0, 0, 0, 82, 0, S_BerryTree, 17, 0, 0 Route130_MapEvents:: @ 8385284 map_events Route130_MapObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc index 490afda7b..ef1559687 100644 --- a/data/maps/events/RusturfTunnel.inc +++ b/data/maps/events/RusturfTunnel.inc @@ -1,12 +1,12 @@ RusturfTunnel_MapObjects:: @ 838BD2C object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 23, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, 807, 0, 0 - object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 931, 0, 0 + object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 931, 0, 0 object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, 1048, 0, 0 object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, 1049, 0, 0 object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 879, 0, 0 object_event 6, 241, 0, 14, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, 878, 0, 0 object_event 7, MAP_OBJ_GFX_WINGULL, 0, 14, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, 880, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, BreakableRockScript, 932, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, S_BreakableRock, 932, 0, 0 object_event 9, MAP_OBJ_GFX_HIKER, 0, 32, 0, 13, 0, 3, 9, 17, 0, 1, 0, 3, 0, RusturfTunnel_EventScript_15CACD, 0, 0, 0 object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 25, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C782, 983, 0, 0 diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/events/SafariZone_Northeast.inc index 30921f095..cea87fb14 100644 --- a/data/maps/events/SafariZone_Northeast.inc +++ b/data/maps/events/SafariZone_Northeast.inc @@ -1,12 +1,12 @@ SafariZone_Northeast_MapObjects:: @ 8391A2C object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 22, 0, 9, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_160011, 0, 0, 0 object_event 2, MAP_OBJ_GFX_MAN_5, 0, 6, 0, 29, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_16001A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 18, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 20, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 22, 0, 0 + object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 17, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 18, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0 + object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 20, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0 object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B1919, 1119, 0, 0 SafariZone_Northeast_MapEvents:: @ 8391B04 diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc index 1e791f884..093934481 100644 --- a/data/maps/events/SeafloorCavern_Room1.inc +++ b/data/maps/events/SeafloorCavern_Room1.inc @@ -1,7 +1,7 @@ SeafloorCavern_Room1_MapObjects:: @ 838D0B8 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 19, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 + object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 19, 0, 0 object_event 4, 241, 0, 8, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, SeafloorCavern_Room1_EventScript_15DA6D, 946, 0, 0 object_event 5, 241, 0, 15, 0, 10, 0, 3, 16, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room1_EventScript_15DA84, 946, 0, 0 diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/events/SeafloorCavern_Room2.inc index 3dbe5e8a7..86a0354e4 100644 --- a/data/maps/events/SeafloorCavern_Room2.inc +++ b/data/maps/events/SeafloorCavern_Room2.inc @@ -1,13 +1,13 @@ SeafloorCavern_Room2_MapObjects:: @ 838D15C - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 24, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 25, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 24, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 25, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0 SeafloorCavern_Room2_MapWarps:: @ 838D234 warp_def 12, 19, 3, 2, SeafloorCavern_Room1 diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/events/SeafloorCavern_Room3.inc index 98e6066f2..5c5c9c219 100644 --- a/data/maps/events/SeafloorCavern_Room3.inc +++ b/data/maps/events/SeafloorCavern_Room3.inc @@ -1,13 +1,13 @@ SeafloorCavern_Room3_MapObjects:: @ 838D268 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 24, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 25, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0 + object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 24, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 25, 0, 0 object_event 10, 242, 0, 10, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room3_EventScript_15DAA8, 946, 0, 0 SeafloorCavern_Room3_MapWarps:: @ 838D358 diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/events/SeafloorCavern_Room5.inc index 0ebd46a56..37a501512 100644 --- a/data/maps/events/SeafloorCavern_Room5.inc +++ b/data/maps/events/SeafloorCavern_Room5.inc @@ -1,10 +1,10 @@ SeafloorCavern_Room5_MapObjects:: @ 838D3D0 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 21, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 22, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 21, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 22, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 SeafloorCavern_Room5_MapWarps:: @ 838D460 warp_def 4, 1, 3, 1, SeafloorCavern_Room1 diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/events/SeafloorCavern_Room8.inc index 610937753..2d7329aec 100644 --- a/data/maps/events/SeafloorCavern_Room8.inc +++ b/data/maps/events/SeafloorCavern_Room8.inc @@ -1,16 +1,16 @@ SeafloorCavern_Room8_MapObjects:: @ 838D4DC - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 21, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 24, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 25, 0, 0 - object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 26, 0, 0 - object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 27, 0, 0 - object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 28, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 21, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0 + object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 24, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 25, 0, 0 + object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 26, 0, 0 + object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 27, 0, 0 + object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 28, 0, 0 SeafloorCavern_Room8_MapWarps:: @ 838D5FC warp_def 5, 2, 3, 0, SeafloorCavern_Room9 diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/events/ShoalCave_LowTideLowerRoom.inc index a1770b5bb..858f919e0 100644 --- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideLowerRoom.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideLowerRoom_MapObjects:: @ 838DE3C - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 11, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E44F, 0, 0, 0 ShoalCave_LowTideLowerRoom_MapWarps:: @ 838DE6C diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc index a4f778c4d..b00074990 100644 --- a/data/maps/events/VictoryRoad_B1F.inc +++ b/data/maps/events/VictoryRoad_B1F.inc @@ -1,21 +1,21 @@ VictoryRoad_B1F_MapObjects:: @ 838DA04 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 19, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 20, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 18, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 23, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 30, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 25, 0, 0 - object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 26, 0, 0 - object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 27, 0, 0 - object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 28, 0, 0 - object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, BreakableRockScript, 29, 0, 0 - object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, PushableBoulderScript, 31, 0, 0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 19, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 20, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 17, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 18, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 23, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 22, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 30, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 25, 0, 0 + object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 26, 0, 0 + object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 27, 0, 0 + object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 28, 0, 0 + object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, 29, 0, 0 + object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, 31, 0, 0 object_event 14, MAP_OBJ_GFX_MAN_4, 0, 37, 0, 12, 0, 3, 9, 0, 0, 1, 0, 3, 0, VictoryRoad_B1F_EventScript_15DFB5, 0, 0, 0 object_event 15, MAP_OBJ_GFX_WOMAN_7, 0, 26, 0, 16, 0, 3, 7, 0, 0, 1, 0, 4, 0, VictoryRoad_B1F_EventScript_15DFCC, 0, 0, 0 object_event 16, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 21, 0, 3, 9, 0, 0, 1, 0, 2, 0, VictoryRoad_B1F_EventScript_15DFE3, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, BreakableRockScript, 32, 0, 0 + object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, 32, 0, 0 object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 42, 0, 8, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, 1086, 0, 0 object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, 1087, 0, 0 diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 1bbe7d355..f4707d8cb 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -1,4 +1,4 @@ -BerryTreeScript:: @ 81A14DD +S_BerryTree:: @ 81A14DD special FieldObjectInteractionGetBerryTreeData switch 0x8004 case 255, Route102_EventScript_1A1533 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 5728b52d8..6507677e0 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -215,7 +215,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2 jumpeq OldaleTown_PokemonCenter_2F_EventScript_1A42F5 OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E - special HealPlayerParty + special ScrSpecial_HealPlayerParty special SavePlayerParty special LoadPlayerBag copyvar 0x4087, 0x8004 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index b5b3d4670..dcc4b44e7 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -282,7 +282,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558 release end -Event_EggHatch:: @ 81B25BC +S_EggHatch:: @ 81B25BC lockall msgbox UnknownString_81B2C68, 4 special EggHatch diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 176d8e8e8..2f0fb97b9 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -20,7 +20,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA msgbox 0x20234cc, 4 waittext closebutton - special HealPlayerParty + special ScrSpecial_HealPlayerParty setvar 0x8004, 0 setvar 0x8005, 0 special sub_813556C @@ -56,7 +56,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 special sub_8135A14 fanfare 368 waitfanfare - special HealPlayerParty + special ScrSpecial_HealPlayerParty BattleTower_BattleRoom_EventScript_1609B2:: @ 81609B2 msgbox BattleTower_BattleRoom_Text_19AD09, 5 diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index 8f2ce6dc1..2f8ba2121 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -31,7 +31,7 @@ IslandCave_MapScript1_15EF15:: @ 815EF15 setflag 2133 end -gIslandCave_EventScript_OpenRegiiceChamber:: @ 815EF19 +S_OpenRegiceChamber:: @ 815EF19 setmaptile 7, 19, 554, 1 setmaptile 8, 19, 555, 1 setmaptile 9, 19, 556, 1 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index dcf74b77c..09d19c1c5 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -29,7 +29,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD:: @ 81583DD message LilycoveCity_CoveLilyMotel_2F_Text_18708F waittext call LilycoveCity_CoveLilyMotel_2F_EventScript_1A02C5 - special sub_810D6A4 + special ScrSpecial_ShowDiploma waitstate release end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index f8ff8f9f3..aca6b16d4 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -135,7 +135,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE callif 1, LilycoveCity_Harbor_EventScript_1599CE pause 30 spriteinvisible 255, 0, 0 - special HealPlayerParty + special ScrSpecial_HealPlayerParty setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E warp SouthernIsland_Exterior, 255, 13, 22 diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 6adea2eb2..2786c930c 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -21,7 +21,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE special sub_80FA148 compare RESULT, 1 jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B71 - special sub_80F9F3C + special ScrSpecial_CountPokemonMoves compare RESULT, 1 jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B64 msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4 @@ -30,7 +30,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE fadescreen 0 compare 0x8005, 4 jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159ADE - special sub_80F9F84 + special ScrSpecial_GetPokemonNicknameAndMoveName msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5 switch RESULT case 1, LilycoveCity_MoveDeletersHouse_EventScript_159B53 @@ -47,7 +47,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53 end LilycoveCity_MoveDeletersHouse_EventScript_159B64:: @ 8159B64 - special sub_80F9F84 + special ScrSpecial_GetPokemonNicknameAndMoveName msgbox LilycoveCity_MoveDeletersHouse_Text_18B6D0, 4 releaseall end diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index a5a013d5f..c7d1201fd 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -29,7 +29,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E compare RESULT, 2 callif 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE closebutton - special HealPlayerParty + special ScrSpecial_HealPlayerParty move 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF waitmove 0 special LoadPlayerParty diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 1acd4b598..d945aadfc 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -229,7 +229,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F move 2, Route101_Movement_14EAD7 waitmove 0 msgbox Route101_Text_16D191, 4 - special HealPlayerParty + special ScrSpecial_HealPlayerParty setflag 720 clearflag 721 setflag 700 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index d8c19d92c..a77feaa0f 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -25,7 +25,7 @@ Route110_MapScript2_14F933:: @ 814F933 .2byte 0 Route110_EventScript_14F93D:: @ 814F93D - special BeginCyclingRoadChallenge + special ScrSpecial_BeginCyclingRoadChallenge setvar 0x40a9, 2 return diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 48eb5c1df..e156f8948 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -69,7 +69,7 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 specialval RESULT, LeadMonHasEffortRibbon compare RESULT, 1 callif 1, SlateportCity_EventScript_14BB35 - specialval RESULT, GetLeadMonEVCount + specialval RESULT, ScrSpecial_AreLeadMonEVsMaxedOut compare RESULT, 0 callif 1, SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, 4 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index ca4b2bdb9..e9f379b24 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -107,7 +107,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61 LittlerootTown_BrendansHouse_2F_EventScript_1B6A91:: @ 81B6A91 inccounter GAME_STAT_CHECKED_CLOCK fadescreen 1 - special sub_810D6B8 + special ScrSpecial_ViewWallClock waitstate releaseall end diff --git a/data/specials.inc b/data/specials.inc index 1baa55442..3545d1dff 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -7,7 +7,7 @@ .set __special__, 0 .align 2 gSpecials:: - def_special HealPlayerParty + def_special ScrSpecial_HealPlayerParty def_special SetCableClubWarp def_special DoCableClubWarp def_special sub_80810DC @@ -162,7 +162,7 @@ gSpecials:: def_special sub_8123218 def_special sub_8053E90 def_special StartWallClock - def_special sub_810D6B8 + def_special ScrSpecial_ViewWallClock def_special ScrSpecial_ChooseStarter def_special ScrSpecial_StartWallyTutorialBattle def_special sub_80BF9F8 @@ -229,11 +229,11 @@ gSpecials:: def_special sub_80F9A4C def_special sub_80F9EEC def_special sub_80FA0DC - def_special sub_80F9F84 - def_special sub_80F9F3C + def_special ScrSpecial_GetPokemonNicknameAndMoveName + def_special ScrSpecial_CountPokemonMoves def_special sub_8132670 def_special GetRecordedCyclingRoadResults - def_special BeginCyclingRoadChallenge + def_special ScrSpecial_BeginCyclingRoadChallenge def_special GetPlayerAvatarBike def_special FinishCyclingRoadChallenge def_special UpdateCyclingRoadState @@ -271,7 +271,7 @@ gSpecials:: def_special SetTrickHouseEndRoomFlag def_special ScrSpecial_CreatePCMenu def_special AccessHallOfFamePC - def_special sub_810D6A4 + def_special ScrSpecial_ShowDiploma def_special CheckLeadMonCool def_special CheckLeadMonBeauty def_special CheckLeadMonCute @@ -301,7 +301,7 @@ gSpecials:: def_special sub_810F4FC def_special LeadMonHasEffortRibbon def_special GivLeadMonEffortRibbon - def_special GetLeadMonEVCount + def_special ScrSpecial_AreLeadMonEVsMaxedOut def_special sub_8064EAC def_special sub_8064ED4 def_special InitRoamer -- cgit v1.2.3