diff options
| -rwxr-xr-x | asm/macros/contest_ai_script.s | 29 | ||||
| -rw-r--r-- | data/contest_ai_scripts.s | 6 |
2 files changed, 4 insertions, 31 deletions
diff --git a/asm/macros/contest_ai_script.s b/asm/macros/contest_ai_script.s index 07b2ddbb8..efbf78e19 100755 --- a/asm/macros/contest_ai_script.s +++ b/asm/macros/contest_ai_script.s @@ -339,35 +339,8 @@ @ 85 @ 86 - .macro contest_87 param addr + .macro if_effect_in_user_moveset param addr .byte 0x87 .2byte \param .4byte \addr .endm - -@ 88 -@ 89 -@ 8A -@ 8B -@ 8C -@ 8D -@ 8E -@ 8F -@ 90 -@ 91 -@ 92 -@ 93 -@ 94 -@ 95 -@ 96 -@ 97 -@ 98 -@ 99 -@ 9A -@ 9B -@ 9C -@ 9D -@ 9E -@ 9F - -@ adding more if I find more macros greater than 9F. diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index fa2cf49b9..aa88bb787 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -271,13 +271,13 @@ ContestEffect39_score4: end ContestEffect40: - contest_87 0x1D ContestEffectEnd + if_effect_in_user_moveset 0x1D ContestEffectEnd if_random 0x32 ContestEffectEnd score 0x14 end ContestEffect41: - contest_87 0x1E ContestEffectEnd + if_effect_in_user_moveset 0x1E ContestEffectEnd if_random 0x32 ContestEffectEnd score 0x14 end @@ -300,7 +300,7 @@ ContestEffect3_score: end ContestEffect38: - contest_87 0x27 ContestEffect38_contest04 + if_effect_in_user_moveset 0x27 ContestEffect38_contest04 if_user_condition 0x03 ContestEffect38_score1 if_random 0x32 ContestEffectEnd score 0x0F |