diff options
| author | YamaArashi <shadow962@live.com> | 2016-08-19 00:29:25 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-08-19 00:29:25 -0700 |
| commit | 6cb1bbe3c971fcc4c612a3ab68c39edafb710cf7 (patch) | |
| tree | d81ae4561750cba9a3a86daed60d9951de7614a1 | |
| parent | 056a9ae1fa0fdfb68af541e3f7ccfe3e99104058 (diff) | |
make user condition macro consistent
| -rwxr-xr-x | asm/macros/contest_ai_script.s | 15 | ||||
| -rw-r--r-- | data/contest_ai_scripts.s | 10 |
2 files changed, 15 insertions, 10 deletions
diff --git a/asm/macros/contest_ai_script.s b/asm/macros/contest_ai_script.s index f4d4de5d5..c73b9a774 100755 --- a/asm/macros/contest_ai_script.s +++ b/asm/macros/contest_ai_script.s @@ -98,29 +98,34 @@ @ user condition - .macro get_user_condition + .macro get_user_condition .byte 0x10 .endm - .macro if_user_condition_less_than param addr + .macro if_user_condition_less_than param, addr .byte 0x11 .byte \param .4byte \addr .endm - .macro if_user_condition_more_than param addr + .macro if_user_condition_more_than param, addr .byte 0x12 .byte \param .4byte \addr .endm - .macro if_user_condition param addr + .macro if_user_condition_eq param, addr .byte 0x13 .byte \param .4byte \addr .endm -@ 14 + .macro if_user_condition_not_eq param, addr + .byte 0x14 + .byte \param + .4byte \addr + .endm + @ 15 @ 16 @ 17 diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index b5601c3d0..c6825039c 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -250,10 +250,10 @@ Unknown_081DC3C7: end ContestEffect39: - if_user_condition 0x03 ContestEffect39_score1 - if_user_condition 0x02 ContestEffect39_score2 - if_user_condition 0x01 ContestEffect39_score3 - if_user_condition 0x00 ContestEffect39_score4 + if_user_condition_eq 0x03 ContestEffect39_score1 + if_user_condition_eq 0x02 ContestEffect39_score2 + if_user_condition_eq 0x01 ContestEffect39_score3 + if_user_condition_eq 0x00 ContestEffect39_score4 end ContestEffect39_score1: score 0x14 @@ -301,7 +301,7 @@ ContestEffect3_score: ContestEffect38: if_effect_in_user_moveset 0x27 ContestEffect38_contest04 - if_user_condition 0x03 ContestEffect38_score1 + if_user_condition_eq 0x03 ContestEffect38_score1 if_random 0x32 ContestEffectEnd score 0x0F end |