diff options
| -rwxr-xr-x | asm/macros/contest_ai_script.s | 14 | ||||
| -rw-r--r-- | data/contest_ai_scripts.s | 154 |
2 files changed, 84 insertions, 84 deletions
diff --git a/asm/macros/contest_ai_script.s b/asm/macros/contest_ai_script.s index cd6e4312e..f4d4de5d5 100755 --- a/asm/macros/contest_ai_script.s +++ b/asm/macros/contest_ai_script.s @@ -83,7 +83,7 @@ .byte \param .4byte \addr .endm - + .macro if_user_order_eq param addr .byte 0x0E .byte \param @@ -101,13 +101,13 @@ .macro get_user_condition .byte 0x10 .endm - + .macro if_user_condition_less_than param addr .byte 0x11 .byte \param .4byte \addr .endm - + .macro if_user_condition_more_than param addr .byte 0x12 .byte \param @@ -218,7 +218,7 @@ .byte 0x2E .4byte \addr .endm - + @ 2F @ 30 @ 31 @@ -239,13 +239,13 @@ .byte \param .4byte \addr .endm - + .macro if_move_used_count_eq param addr .byte 0x3E .byte \param .4byte \addr .endm - + .macro contest_3F param addr .byte 0x3F .byte \param @@ -398,7 +398,7 @@ @ 85 @ 86 - + .macro if_effect_in_user_moveset param addr .byte 0x87 .2byte \param diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 4de2b5193..b5601c3d0 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -38,11 +38,11 @@ gUnknown_081DC118:: @ 81DC118 .4byte Unknown_081DCAF3 .4byte Unknown_081DCAF3 .4byte Unknown_081DCAF3 - + @ unreferenced if_turn_not_eq 0x00 ContestUnreferenced_80 if_effect_not_eq 0x26 ContestUnreferenced_80 - score 0x0A + score 0x0A ContestUnreferenced_80: contest_80 ContestUnreferenced_0D end @@ -50,7 +50,7 @@ ContestUnreferenced_0D: if_user_order_more_than 0x01 ContestUnreferenced_end contest_2C 0x02 ContestUnreferenced_end contest_2C 0x03 ContestUnreferenced_end - score 0x0A + score 0x0A ContestUnreferenced_end: end if_turn_eq 0x00 ContestUnreferenced_0F_1 @@ -63,7 +63,7 @@ ContestUnreferenced_0F_1: if_user_order_not_eq 0x00 ContestUnreferenced_2B_1 if_user_order_not_eq 0x01 ContestUnreferenced_2B_2 if_user_order_not_eq 0x02 ContestUnreferenced_2B_1 - if_user_order_not_eq 0x03 ContestUnreferenced_2B_1 + if_user_order_not_eq 0x03 ContestUnreferenced_2B_1 end ContestUnreferenced_2B_1: contest_2B 0x01 ContestUnreferenced_score @@ -98,13 +98,13 @@ ContestUnreferenced_0F_5: if_user_order_not_eq 0x03 ContestUnreferenced_2B_1 end ContestUnreferenced_score: - score 0x0A + score 0x0A end end contest_2E ContestUnreferenced_score2 end ContestUnreferenced_score2: - score 0x0A + score 0x0A end Unknown_081DC27F: @@ -138,50 +138,50 @@ AI_contest09_081DC2AB: if_excitement_eq 0x04 AI_contest0F_1_081DC2AB if_excitement_eq 0x03 AI_contest0F_2_081DC2AB if_user_has_exciting_move AI_end_081DC2AB - score 0x0F + score 0x0F end AI_contest0F_1_081DC2AB: if_user_order_not_eq 0x00 AI_contest7D_1_081DC2AB if_random 0x33 AI_end_081DC2AB - score 0x14 + score 0x14 end AI_contest7D_1_081DC2AB: if_random 0x7F AI_end_081DC2AB - score 0xF6 + score 0xF6 end AI_contest0F_2_081DC2AB: if_user_order_not_eq 0x00 AI_contest7D_3_081DC2AB if_turn_eq 0x04 AI_score_081DC2AB AI_contest7D_2_081DC2AB: if_random 0x33 AI_end_081DC2AB - score 0x0A + score 0x0A end AI_score_081DC2AB: - score 0x0F + score 0x0F end AI_contest7D_3_081DC2AB: if_random 0x7F AI_end_081DC2AB - score 0x0A + score 0x0A end AI_contest7D_4_081DC2AB: if_random 0x7F AI_end_081DC2AB - score 0x0A + score 0x0A end AI_contest3D_081DC2AB: contest_3D 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 + score 0x1E end AI_contest7D_5_081DC2AB: if_random 0x64 AI_end_081DC2AB - score 0x0A + score 0x0A end AI_contest29_081DC2AB: if_effect_not_eq 0x03 AI_end_081DC2AB if_user_order_not_eq 0x00 AI_contest7D_5_081DC2AB if_excitement_not_eq 0x04 AI_contest7D_5_081DC2AB - score 0x1E + score 0x1E end AI_end_081DC2AB: end @@ -270,7 +270,7 @@ ContestEffect39_score4: score 0xEC end -ContestEffect40: +ContestEffect40: if_effect_in_user_moveset 0x1D ContestEffectEnd if_random 0x32 ContestEffectEnd score 0x14 @@ -428,17 +428,17 @@ ContestEffect27_55_1: end ContestEffect27_score1: if_random 0x7D ContestEffect27_55_2 - score 0x05 + score 0x05 if_user_order_more_than 0x01 ContestEffect27_55_2 end ContestEffect27_score2: if_random 0x7D ContestEffect27_55_2 - score 0x0A + score 0x0A if_user_order_more_than 0x01 ContestEffect27_55_2 end ContestEffect27_score3: if_random 0x7D ContestEffect27_55_2 - score 0x0F + score 0x0F if_user_order_more_than 0x01 ContestEffect27_55_2 end ContestEffect27_noscore: @@ -453,17 +453,17 @@ ContestEffect27_55_2: end ContestEffect27_score4: if_random 0x7D ContestEffect27_55_3 - score 0x05 + score 0x05 if_user_order_more_than 0x02 ContestEffect27_55_3 end ContestEffect27_score5: if_random 0x7D ContestEffect27_55_3 - score 0x0A + score 0x0A if_user_order_more_than 0x02 ContestEffect27_55_3 end ContestEffect27_score6: if_random 0x7D ContestEffect27_55_3 - score 0x0F + score 0x0F if_user_order_more_than 0x02 ContestEffect27_55_3 end ContestEffect27_noscore2: @@ -477,16 +477,16 @@ ContestEffect27_55_3: contest_4C 0x02 0x03 ContestEffect27_score9 end ContestEffect27_score7: - if_random 0x7D ContestEffectEnd - score 0x05 + if_random 0x7D ContestEffectEnd + score 0x05 end ContestEffect27_score8: - if_random 0x7D ContestEffectEnd - score 0x0A + if_random 0x7D ContestEffectEnd + score 0x0A end ContestEffect27_score9: - if_random 0x7D ContestEffectEnd - score 0x0F + if_random 0x7D ContestEffectEnd + score 0x0F end ContestEffect27_end: end @@ -499,27 +499,27 @@ ContestEffect16or17_55: contest_55 0x00 ContestEffect16or17_0E_1 contest_51 0x00 0x01 ContestEffect16or17_0E_1 if_random 0x7D ContestEffect16or17_0E_1 - score 0x02 + score 0x02 contest_58 0x00 ContestEffect16or17_0E_1 - score 0x08 + score 0x08 end ContestEffect16or17_0E_1: if_user_order_eq 0x01 ContestEffectEnd contest_55 0x01 ContestEffect16or17_0E_2 contest_51 0x01 0x01 ContestEffect16or17_0E_2 if_random 0x7D ContestEffect16or17_0E_2 - score 0x02 + score 0x02 contest_58 0x01 ContestEffect16or17_0E_2 - score 0x08 + score 0x08 end ContestEffect16or17_0E_2: if_user_order_eq 0x02 ContestEffectEnd contest_55 0x02 ContestEffectEnd contest_51 0x02 0x01 ContestEffectEnd if_random 0x7D ContestEffectEnd - score 0x02 + score 0x02 contest_58 0x02 ContestEffectEnd - score 0x08 + score 0x08 end ContestEffect26: @@ -529,15 +529,15 @@ ContestEffect26: ContestEffect26_55: contest_55 0x03 ContestEffect26_0E_1 contest_51 0x03 0x00 ContestEffect26_0E_1 - score 0x05 + score 0x05 if_random 0x7D ContestEffect16or17_0E_1 - score 0x05 + score 0x05 end ContestEffect26_0E_1: if_user_order_eq 0x02 ContestEffectEnd contest_55 0x02 ContestEffect26_0E_2 contest_51 0x02 0x00 ContestEffect26_0E_2 - score 0x05 + score 0x05 if_random 0x7D ContestEffect16or17_0E_2 score 0x05 end @@ -545,7 +545,7 @@ ContestEffect26_0E_2: if_user_order_eq 0x01 ContestEffectEnd contest_55 0x01 ContestEffectEnd contest_51 0x01 0x00 ContestEffectEnd - score 0x05 + score 0x05 if_random 0x7D ContestEffectEnd score 0x05 end @@ -555,7 +555,7 @@ ContestEffect18: contest_7F ContestEffect18_0E end ContestEffect18_score1: - score 0x05 + score 0x05 contest_7F ContestEffect18_0E end ContestEffect18_0E: @@ -565,19 +565,19 @@ ContestEffect18_0E: if_user_order_eq 0x03 ContestEffect18_random3 end ContestEffect18_score2: - score 0xF1 + score 0xF1 end ContestEffect18_random1: if_random 0x7D ContestEffectEnd - score 0xF6 + score 0xF6 end ContestEffect18_random2: if_random 0x7D ContestEffectEnd - score 0x05 + score 0x05 end ContestEffect18_random3: if_random 0x7D ContestEffectEnd - score 0x0F + score 0x0F end ContestEffectEnd: @@ -660,63 +660,63 @@ ContestEffect2_9: if_user_order_eq 0x03 ContestEffect2_9_score4 end ContestEffect2_9_score1: - score 0xEC + score 0xEC end ContestEffect2_9_score2: contest_54 0x00 ContestEffectEnd2 - score 0xF1 + score 0xF1 end ContestEffect2_9_score3: contest_54 0x00 ContestEffectEnd2 contest_54 0x01 ContestEffectEnd2 - score 0xF1 + score 0xF1 end ContestEffect2_9_score4: contest_54 0x00 ContestEffectEnd2 contest_54 0x01 ContestEffectEnd2 contest_54 0x02 ContestEffectEnd2 - score 0xF1 + score 0xF1 end ContestEffect2_25: if_user_order_eq 0x00 ContestEffect2_25_score1 if_user_order_eq 0x01 ContestEffect2_25_score2 if_user_order_eq 0x02 ContestEffect2_25_score3 - score 0xF6 + score 0xF6 end ContestEffect2_25_score1: contest_54 0x01 ContestEffectEnd2 - score 0xF6 + score 0xF6 end ContestEffect2_25_score2: contest_54 0x02 ContestEffectEnd2 - score 0xF6 + score 0xF6 end ContestEffect2_25_score3: contest_54 0x03 ContestEffectEnd2 - score 0xF6 + score 0xF6 end ContestEffect2_26: if_user_order_eq 0x00 ContestEffect2_26_score1 if_user_order_eq 0x01 ContestEffect2_26_score2 if_user_order_eq 0x02 ContestEffect2_26_score3 - score 0xF6 + score 0xF6 end ContestEffect2_26_score1: contest_54 0x01 ContestEffectEnd2 contest_54 0x02 ContestEffectEnd2 contest_54 0x03 ContestEffectEnd2 - score 0xF6 + score 0xF6 end ContestEffect2_26_score2: contest_54 0x02 ContestEffectEnd2 contest_54 0x03 ContestEffectEnd2 - score 0xF6 + score 0xF6 end ContestEffect2_26_score3: contest_54 0x03 ContestEffectEnd2 - score 0xF6 + score 0xF6 end ContestEffect2_38: @@ -728,22 +728,22 @@ ContestEffect2_4: if_user_order_eq 0x00 ContestEffect2_4_score1 if_user_order_eq 0x01 ContestEffect2_4_score2 if_user_order_eq 0x02 ContestEffect2_4_score3 - score 0xF6 + score 0xF6 end ContestEffect2_4_score1: contest_54 0x01 ContestEffectEnd2 contest_54 0x02 ContestEffectEnd2 contest_54 0x03 ContestEffectEnd2 - score 0xF6 + score 0xF6 end ContestEffect2_4_score2: contest_54 0x02 ContestEffectEnd2 contest_54 0x03 ContestEffectEnd2 - score 0xF6 + score 0xF6 end ContestEffect2_4_score3: contest_54 0x03 ContestEffectEnd2 - score 0xF6 + score 0xF6 end ContestEffect2_2: @@ -755,25 +755,25 @@ ContestEffect2_2: end ContestEffect2_2_score1: if_random 0x14 ContestEffectEnd2 - score 0xF1 + score 0xF1 end ContestEffect2_2_score2: if_random 0x28 ContestEffectEnd2 - score 0xF1 + score 0xF1 end ContestEffect2_2_score3: if_random 0x3C ContestEffectEnd2 - score 0xF1 + score 0xF1 end ContestEffect2_2_score4: if_random 0x50 ContestEffectEnd2 - score 0xF1 + score 0xF1 end ContestEffect2_2_score5: if_random 0x14 ContestEffectEnd2 - score 0x14 + score 0x14 end - + ContestEffectEnd2: end @@ -789,33 +789,33 @@ AI_effectcheck1_081DCA4C: contest_2B 0x01 AI_random1_081DCA4C end AI_score1_081DCA4C: - score 0x0F + score 0x0F end AI_score2_081DCA4C: - score 0xF1 + score 0xF1 end AI_random1_081DCA4C: if_random 0x64 ContestEffectEnd2 - score 0x0A + score 0x0A end AI_effectcheck2_081DCA4C: if_effect_eq 0x21 AI_score3_081DCA4C contest_2B 0x01 AI_random2_081DCA4C end AI_score3_081DCA4C: - score 0xFB + score 0xFB end AI_random2_081DCA4C: if_random 0x7D ContestEffectEnd2 - score 0x0A + score 0x0A end AI_effectcheck3_081DCA4C: if_effect_eq 0x21 AI_score4_081DCA4C - if_effect_eq 0x1F AI_score4_081DCA4C + if_effect_eq 0x1F AI_score4_081DCA4C if_effect_eq 0x01 AI_score4_081DCA4C end AI_score4_081DCA4C: - score 0x05 + score 0x05 end AI_effectcheck4_081DCA4C: if_effect_eq 0x21 AI_score5_081DCA4C @@ -827,17 +827,17 @@ AI_effectcheck4_081DCA4C: contest_2B 0x03 AI_random3_081DCA4C end AI_score5_081DCA4C: - score 0x0F + score 0x0F end AI_score6_081DCA4C: - score 0xF6 + score 0xF6 end AI_random3_081DCA4C: if_random 0x7D ContestEffectEnd2 - score 0x0A + score 0x0A end AI_score7_081DCA4C: - score 0x05 + score 0x05 end Unknown_081DCAF3: |