diff options
| -rwxr-xr-x | asm/macros/contest_ai_script.s | 20 | ||||
| -rw-r--r-- | data/contest_ai_scripts.s | 4 |
2 files changed, 17 insertions, 7 deletions
diff --git a/asm/macros/contest_ai_script.s b/asm/macros/contest_ai_script.s index 3bcff01da..bff847025 100755 --- a/asm/macros/contest_ai_script.s +++ b/asm/macros/contest_ai_script.s @@ -244,22 +244,32 @@ @ 38 @ 39 @ 3A -@ 3B -@ 3C - .macro contest_3D param addr +@ number of times current move has been used + + .macro get_move_used_count + .byte 0x3B + .endm + + .macro if_move_used_count_less_than param, addr + .byte 0x3C + .byte \param + .4byte \addr + .endm + + .macro if_move_used_count_more_than param, addr .byte 0x3D .byte \param .4byte \addr .endm - .macro if_move_used_count_eq param addr + .macro if_move_used_count_eq param, addr .byte 0x3E .byte \param .4byte \addr .endm - .macro contest_3F param addr + .macro if_move_used_count_not_eq param, addr .byte 0x3F .byte \param .4byte \addr diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 4c22cdd5b..02ecb28ba 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -168,7 +168,7 @@ AI_contest7D_4_081DC2AB: score 0x0A end AI_contest3D_081DC2AB: - contest_3D 0x00 AI_contest29_081DC2AB + if_move_used_count_more_than 0x00 AI_contest29_081DC2AB if_user_order_not_eq 0x00 AI_contest7D_5_081DC2AB if_excitement_not_eq 0x04 AI_contest7D_5_081DC2AB score 0x1E @@ -192,7 +192,7 @@ Unknown_081DC348: contest_80 AI_contest45_081DC348 end AI_contest3F_081DC348: - contest_3F 0x00 AI_end_081DC348 + if_move_used_count_not_eq 0x00 AI_end_081DC348 contest_42 AI_end_081DC348 if_user_order_eq 0x00 AI_contest04_1_081DC348 if_user_order_eq 0x01 AI_contest04_2_081DC348 |