diff options
| author | YamaArashi <shadow962@live.com> | 2016-08-19 01:26:10 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-08-19 01:26:10 -0700 |
| commit | 7a8900ad5230b313964590b28c1a2813225052c1 (patch) | |
| tree | 85739545f0abfe1e921f2ef2485565b6976e3755 | |
| parent | 755f765cf36eba612b1773a0fd5d815e6abc40df (diff) | |
combo starter macros
| -rwxr-xr-x | asm/macros/contest_ai_script.s | 14 | ||||
| -rw-r--r-- | data/contest_ai_scripts.s | 2 |
2 files changed, 12 insertions, 4 deletions
diff --git a/asm/macros/contest_ai_script.s b/asm/macros/contest_ai_script.s index bff847025..55eba4be0 100755 --- a/asm/macros/contest_ai_script.s +++ b/asm/macros/contest_ai_script.s @@ -275,10 +275,18 @@ .4byte \addr .endm -@ 40 -@ 41 +@ whether the current move is a combo starter - .macro contest_42 addr + .macro check_combo_starter + .byte 0x40 + .endm + + .macro if_combo_starter addr + .byte 0x41 + .4byte \addr + .endm + + .macro if_not_combo_starter addr .byte 0x42 .4byte \addr .endm diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 02ecb28ba..0e2cb14b0 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -193,7 +193,7 @@ Unknown_081DC348: end AI_contest3F_081DC348: if_move_used_count_not_eq 0x00 AI_end_081DC348 - contest_42 AI_end_081DC348 + if_not_combo_starter AI_end_081DC348 if_user_order_eq 0x00 AI_contest04_1_081DC348 if_user_order_eq 0x01 AI_contest04_2_081DC348 if_user_order_eq 0x02 AI_contest04_3_081DC348 |