diff options
| author | YamaArashi <shadow962@live.com> | 2016-08-19 01:40:18 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-08-19 01:40:18 -0700 |
| commit | 73223372bdd201258099ade7f18273447d4a1201 (patch) | |
| tree | 54a936741aee0d02a36eccc00ce6c1f68263466b | |
| parent | 3a33e298a40d3b34a2682009f1198d339b729270 (diff) | |
would finish combo 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 aaf7f7e45..458b6b27f 100755 --- a/asm/macros/contest_ai_script.s +++ b/asm/macros/contest_ai_script.s @@ -307,14 +307,22 @@ .4byte \addr .endm -@ 46 +@ whether the current move would finish a combo - .macro contest_47 addr + .macro check_would_finish_combo + .byte 0x46 + .endm + + .macro if_would_finish_combo addr .byte 0x47 .4byte \addr .endm -@ 48 + .macro if_would_not_finish_combo addr + .byte 0x48 + .4byte \addr + .endm + @ 49 @ 4A @ 4B diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index bc325aa07..3275c5985 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -187,7 +187,7 @@ AI_end_081DC2AB: end Unknown_081DC348: - contest_47 AI_score_081DC348 + if_would_finish_combo AI_score_081DC348 contest_80 AI_contest3F_081DC348 contest_80 AI_contest45_081DC348 end |