diff options
| -rwxr-xr-x | asm/macros/contest_ai_script.s | 15 | ||||
| -rw-r--r-- | data/contest_ai_scripts.s | 13 |
2 files changed, 25 insertions, 3 deletions
diff --git a/asm/macros/contest_ai_script.s b/asm/macros/contest_ai_script.s index 1c06ec4c4..b4bab1f91 100755 --- a/asm/macros/contest_ai_script.s +++ b/asm/macros/contest_ai_script.s @@ -16,9 +16,20 @@ .4byte \addr .endm -@ 05 + .macro contest_05 param addr + .byte 0x05 + .byte \param + .4byte \addr + .endm + @ 06 -@ 07 + + .macro contest_07 param addr + .byte 0x07 + .byte \param + .4byte \addr + .endm + @ 08 .macro contest_09 param addr diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 79fa3e4e5..ac2263965 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -257,7 +257,18 @@ ContestEffect38_score2: end ContestEffect47: - .incbin "baserom.gba", 0x001dc4d7, 0x2F + if_move_used_count_eq 1 ContestEffectEnd + contest_0E 0x00 ContestEffect47_random + contest_0E 0x01 ContestEffect47_random + contest_05 0x04 ContestEffectEnd + contest_83 ContestEffectEnd + contest_07 0x01 ContestEffectEnd + score 0x0A + end +ContestEffect47_random: + if_random 0x7F ContestEffectEnd + score 0x0A + end ContestEffect31: .incbin "baserom.gba", 0x001dc506, 0x1C |