diff options
| -rwxr-xr-x | asm/macros/contest_ai_script.s | 346 | ||||
| -rw-r--r-- | data/contest_ai_scripts.s | 838 | ||||
| -rw-r--r-- | data/text/battle_strings.s | 3 | 
3 files changed, 1184 insertions, 3 deletions
| diff --git a/asm/macros/contest_ai_script.s b/asm/macros/contest_ai_script.s new file mode 100755 index 000000000..efbf78e19 --- /dev/null +++ b/asm/macros/contest_ai_script.s @@ -0,0 +1,346 @@ +@ contest AI macro research + + +	.macro score score +	.byte 0x00 +	.byte \score +	.endm + +@ 01 +@ 02 +@ 03 + +	.macro contest_04 param addr +	.byte 0x04 +	.byte \param +	.4byte \addr +	.endm + +	.macro contest_05 param addr +	.byte 0x05 +	.byte \param +	.4byte \addr +	.endm + +@ 06 + +	.macro contest_07 param addr +	.byte 0x07 +	.byte \param +	.4byte \addr +	.endm + +@ 08 + +	.macro contest_09 param addr +	.byte 0x09 +	.byte \param +	.4byte \addr +	.endm + +	.macro contest_0A param addr +	.byte 0x0A +	.byte \param +	.4byte \addr +	.endm + +@ 0B +@ 0C + +	.macro contest_0D param addr +	.byte 0x0D +	.byte \param +	.4byte \addr +	.endm +	 +	.macro contest_0E param addr +	.byte 0x0E +	.byte \param +	.4byte \addr +	.endm + +	.macro contest_0F param addr +	.byte 0x0F +	.byte \param +	.4byte \addr +	.endm + +	.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 +	.4byte \addr +	.endm + +	.macro if_user_condition param addr +	.byte 0x13 +	.byte \param +	.4byte \addr +	.endm + +@ 14 +@ 15 +@ 16 +@ 17 +@ 18 +@ 19 +@ 1A +@ 1B +@ 1C +@ 1D +@ 1E +@ 1F + +	.macro contest_20 param addr +	.byte 0x20 +	.byte \param +	.4byte \addr +	.endm + +@ 21 +@ 22 +	 +	.macro contest_23 param addr +	.byte 0x23 +	.byte \param +	.4byte \addr +	.endm + +@ 24 + +	.macro contest_25 param addr +	.byte 0x25 +	.byte \param +	.4byte \addr +	.endm + +@ 26 +@ 27 +	 +	.macro if_effect param addr +	.byte 0x28 +	.byte \param +	.4byte \addr +	.endm + +	.macro contest_29 param addr +	.byte 0x29 +	.byte \param +	.4byte \addr +	.endm + +@ 2A + +	.macro contest_2B param addr +	.byte 0x2B +	.byte \param +	.4byte \addr +	.endm + +	.macro contest_2C param addr +	.byte 0x2C +	.byte \param +	.4byte \addr +	.endm + +@ 2D + +	.macro contest_2E addr +	.byte 0x2E +	.4byte \addr +	.endm +	 +@ 2F +@ 30 +@ 31 +@ 32 +@ 33 +@ 34 +@ 35 +@ 36 +@ 37 +@ 38 +@ 39 +@ 3A +@ 3B +@ 3C + +	.macro contest_3D param addr +	.byte 0x3D +	.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 +	.4byte \addr +	.endm + +@ 40 +@ 41 + +	.macro contest_42 addr +	.byte 0x42 +	.4byte \addr +	.endm + +@ 43 +@ 44 + +	.macro contest_45 addr +	.byte 0x45 +	.4byte \addr +	.endm + +@ 46 + +	.macro contest_47 addr +	.byte 0x47 +	.4byte \addr +	.endm + +@ 48 +@ 49 +@ 4A +@ 4B + +	.macro contest_4C param1 param2 addr +	.byte 0x4C +	.byte \param1 +	.byte \param2 +	.4byte \addr +	.endm + +@ 4D +@ 4E +@ 4F +@ 50 + +	.macro contest_51 param1 param2 addr +	.byte 0x51 +	.byte \param1 +	.byte \param2 +	.4byte \addr +	.endm + +@ 52 +@ 53 + +	.macro contest_54 param addr +	.byte 0x54 +	.byte \param +	.4byte \addr +	.endm + +	.macro contest_55 param addr +	.byte 0x55 +	.byte \param +	.4byte \addr +	.endm + +@ 56 +@ 57 + +	.macro contest_58 param addr +	.byte 0x58 +	.byte \param +	.4byte \addr +	.endm + +@ 59 +@ 5A +@ 5B +@ 5C +@ 5D +@ 5E +@ 5F +@ 60 +@ 61 +@ 62 +@ 63 +@ 64 +@ 65 +@ 66 +@ 67 +@ 68 +@ 69 +@ 6A +@ 6B +@ 6C +@ 6D +@ 6E +@ 6F +@ 70 +@ 71 +@ 72 +@ 73 +@ 74 +@ 75 +@ 76 +@ 77 +@ 78 +@ 79 +@ 7A +@ 7B +@ 7C + +	.macro if_random param addr +	.byte 0x7D +	.byte \param +	.4byte \addr +	.endm + +@ 7E + +	.macro contest_7F addr +	.byte 0x7F +	.4byte \addr +	.endm + +	.macro contest_80 addr +	.byte 0x80 +	.4byte \addr +	.endm + +	.macro end +	.byte 0x81 +	.endm + +	.macro check_user_has_exciting_move +	.byte 0x82 +	.endm + +	.macro if_user_has_exciting_move addr +	.byte 0x83 +	.4byte \addr +	.endm + +	.macro if_user_doesnt_have_exciting_move addr +	.byte 0x84 +	.4byte \addr +	.endm + +@ 85 +@ 86 +	 +	.macro if_effect_in_user_moveset param addr +	.byte 0x87 +	.2byte \param +	.4byte \addr +	.endm diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 82b7a2255..aa88bb787 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -1,8 +1,844 @@  	.include "asm/macros.s" +	.include "asm/macros/contest_ai_script.s"  	.include "constants/constants.s"  	.section script_data, "aw", %progbits  	.align 2  gUnknown_081DC118:: @ 81DC118 -	.incbin "baserom.gba", 0x001dc118, 0x9dc +	.4byte Unknown_081DC7FB +	.4byte Unknown_081DC348 +	.4byte Unknown_081DC27F +	.4byte Unknown_081DC2AB +	.4byte Unknown_081DCA4C +	.4byte Unknown_081DC3C7 +	.4byte Unknown_081DC7DE +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	.4byte Unknown_081DCAF3 +	 +	@ unreferenced +	contest_05 0x00 ContestUnreferenced_80 +	contest_29 0x26 ContestUnreferenced_80 +	score 0x0A  +ContestUnreferenced_80: +	contest_80 ContestUnreferenced_0D +	end +ContestUnreferenced_0D: +	contest_0D 0x01 ContestUnreferenced_end +	contest_2C 0x02 ContestUnreferenced_end +	contest_2C 0x03 ContestUnreferenced_end +	score 0x0A  +ContestUnreferenced_end: +	end +	contest_04 0x00 ContestUnreferenced_0F_1 +	contest_04 0x01 ContestUnreferenced_0F_2 +	contest_04 0x02 ContestUnreferenced_0F_3 +	contest_04 0x03 ContestUnreferenced_0F_4 +	contest_04 0x04 ContestUnreferenced_0F_5 +	end +ContestUnreferenced_0F_1: +	contest_0F 0x00 ContestUnreferenced_2B_1 +	contest_0F 0x01 ContestUnreferenced_2B_2 +	contest_0F 0x02 ContestUnreferenced_2B_1 +	contest_0F 0x03 ContestUnreferenced_2B_1  +	end +ContestUnreferenced_2B_1: +	contest_2B 0x01 ContestUnreferenced_score +	end +ContestUnreferenced_2B_2: +	contest_2B 0x01 ContestUnreferenced_score +	end +	contest_2B 0x01 ContestUnreferenced_score +	end +ContestUnreferenced_0F_2: +	contest_0F 0x00 ContestUnreferenced_2B_1 +	contest_0F 0x01 ContestUnreferenced_2B_1 +	contest_0F 0x02 ContestUnreferenced_2B_1 +	contest_0F 0x03 ContestUnreferenced_2B_1 +	end +ContestUnreferenced_0F_3: +	contest_0F 0x00 ContestUnreferenced_2B_1 +	contest_0F 0x01 ContestUnreferenced_2B_1 +	contest_0F 0x02 ContestUnreferenced_2B_1 +	contest_0F 0x03 ContestUnreferenced_2B_1 +	end +ContestUnreferenced_0F_4: +	contest_0F 0x00 ContestUnreferenced_2B_1 +	contest_0F 0x01 ContestUnreferenced_2B_1 +	contest_0F 0x02 ContestUnreferenced_2B_1 +	contest_0F 0x03 ContestUnreferenced_2B_1 +	end +ContestUnreferenced_0F_5: +	contest_0F 0x00 ContestUnreferenced_2B_1 +	contest_0F 0x01 ContestUnreferenced_2B_1 +	contest_0F 0x02 ContestUnreferenced_2B_1 +	contest_0F 0x03 ContestUnreferenced_2B_1 +	end +ContestUnreferenced_score: +	score 0x0A  +	end +	end +	contest_2E ContestUnreferenced_score2 +	end +ContestUnreferenced_score2: +	score 0x0A  +	end + +Unknown_081DC27F: +	if_effect 3, AI_end_081DC27F +	if_move_used_count_eq 1 AI_score1_081DC27F +	if_move_used_count_eq 2 AI_score2_081DC27F +	if_move_used_count_eq 3 AI_score3_081DC27F +	if_move_used_count_eq 4 AI_score4_081DC27F +	end +AI_score1_081DC27F: +	score 0xFB +	end +AI_score2_081DC27F: +	score 0xF1 +	end +AI_score3_081DC27F: +	score 0xEC +	end +AI_score4_081DC27F: +	score 0xE7 +	end +AI_end_081DC27F: +	end + +Unknown_081DC2AB: +	contest_23 0x00 AI_contest09_081DC2AB +	contest_25 0x00 AI_contest7D_4_081DC2AB +	contest_25 0x01 AI_contest3D_081DC2AB +	end +AI_contest09_081DC2AB: +	contest_09 0x04 AI_contest0F_1_081DC2AB +	contest_09 0x03 AI_contest0F_2_081DC2AB +	if_user_has_exciting_move AI_end_081DC2AB +	score 0x0F  +	end +AI_contest0F_1_081DC2AB: +	contest_0F 0x00 AI_contest7D_1_081DC2AB +	if_random 0x33 AI_end_081DC2AB +	score 0x14  +	end +AI_contest7D_1_081DC2AB: +	if_random 0x7F AI_end_081DC2AB +	score 0xF6  +	end +AI_contest0F_2_081DC2AB: +	contest_0F 0x00 AI_contest7D_3_081DC2AB +	contest_04 0x04 AI_score_081DC2AB +AI_contest7D_2_081DC2AB: +	if_random 0x33 AI_end_081DC2AB +	score 0x0A  +	end +AI_score_081DC2AB: +	score 0x0F  +	end +AI_contest7D_3_081DC2AB: +	if_random 0x7F AI_end_081DC2AB +	score 0x0A  +	end +AI_contest7D_4_081DC2AB: +	if_random 0x7F AI_end_081DC2AB +	score 0x0A  +	end +AI_contest3D_081DC2AB: +	contest_3D 0x00 AI_contest29_081DC2AB +	contest_0F 0x00 AI_contest7D_5_081DC2AB +	contest_0A 0x04 AI_contest7D_5_081DC2AB +	score 0x1E  +	end +AI_contest7D_5_081DC2AB: +	if_random 0x64 AI_end_081DC2AB +	score 0x0A  +	end +AI_contest29_081DC2AB: +	contest_29 0x03 AI_end_081DC2AB +	contest_0F 0x00 AI_contest7D_5_081DC2AB +	contest_0A 0x04 AI_contest7D_5_081DC2AB +	score 0x1E  +	end +AI_end_081DC2AB: +	end + +Unknown_081DC348: +	contest_47 AI_score_081DC348 +	contest_80 AI_contest3F_081DC348 +	contest_80 AI_contest45_081DC348 +	end +AI_contest3F_081DC348: +	contest_3F 0x00 AI_end_081DC348 +	contest_42 AI_end_081DC348 +	contest_0E 0x00 AI_contest04_1_081DC348 +	contest_0E 0x01 AI_contest04_2_081DC348 +	contest_0E 0x02 AI_contest04_3_081DC348 +	contest_0E 0x03 AI_contest04_4_081DC348 +	end +AI_contest45_081DC348: +	contest_45 AI_end_081DC348 +	score 0xF6 +	end +AI_score_081DC348: +	score 0x19 +	end +AI_contest04_1_081DC348: +	contest_04 0x04 AI_contest7D_081DC348 +	if_random 0x96 AI_end_081DC348 +	score 0x0A +	end +AI_contest04_2_081DC348: +	contest_04 0x04 AI_contest7D_081DC348 +	if_random 0x7D AI_end_081DC348 +	score 0x0A +	end +AI_contest04_3_081DC348: +	contest_04 0x04 AI_contest7D_081DC348 +	if_random 0x32 AI_end_081DC348 +	score 0x0A +	end +AI_contest04_4_081DC348: +	contest_04 0x04 AI_contest7D_081DC348 +	score 0x0A +	end +AI_contest7D_081DC348: +	if_random 0x7D AI_end_081DC348 +	score 0xF1 +	end +AI_end_081DC348: +	end + +Unknown_081DC3C7: +	if_effect 39, ContestEffect39 +	if_effect 40, ContestEffect40 +	if_effect 41, ContestEffect41 +	if_effect 3, ContestEffect3 +	if_effect 38, ContestEffect38 +	if_effect 47, ContestEffect47 +	if_effect 31, ContestEffect31 +	if_effect 32, ContestEffect32 +	if_effect 46, ContestEffect46 +	if_effect 27, ContestEffect27 +	if_effect 16, ContestEffect16or17 +	if_effect 17, ContestEffect16or17 +	if_effect 26, ContestEffect26 +	if_effect 18, ContestEffect18 +	end + +ContestEffect39: +	if_user_condition 0x03 ContestEffect39_score1 +	if_user_condition 0x02 ContestEffect39_score2 +	if_user_condition 0x01 ContestEffect39_score3 +	if_user_condition 0x00 ContestEffect39_score4 +	end +ContestEffect39_score1: +	score 0x14 +	end +ContestEffect39_score2: +	if_random 0x7D ContestEffectEnd +	score 0x0F +	end +ContestEffect39_score3: +	if_random 0x7D ContestEffectEnd +	score 0x05 +	end +ContestEffect39_score4: +	score 0xEC +	end + +ContestEffect40:	 +	if_effect_in_user_moveset 0x1D ContestEffectEnd +	if_random 0x32 ContestEffectEnd +	score 0x14 +	end + +ContestEffect41: +	if_effect_in_user_moveset 0x1E ContestEffectEnd +	if_random 0x32 ContestEffectEnd +	score 0x14 +	end + +ContestEffect3: +	contest_0F 0x03 ContestEffectEnd +	if_random 0x32 ContestEffectEnd +	score 0x0F +	end +	contest_04 0x04 ContestEffect3_7D +	if_random 0xDC ContestEffect3_score +	score 0x0A +	end +ContestEffect3_7D: +	if_random 0x14 ContestEffectEnd +	score 0x0F +	end +ContestEffect3_score: +	score 0xEC +	end + +ContestEffect38: +	if_effect_in_user_moveset 0x27 ContestEffect38_contest04 +	if_user_condition 0x03 ContestEffect38_score1 +	if_random 0x32 ContestEffectEnd +	score 0x0F +	end +ContestEffect38_score1: +	score 0xF6 +	end +ContestEffect38_contest04: +	contest_04 0x04 ContestEffect38_score2 +	contest_04 0x00 ContestEffect38_random +	if_move_used_count_eq 1 ContestEffectEnd +	if_random 0x7D ContestEffectEnd +	score 0x0A +	end +ContestEffect38_random: +	if_random 0x64 ContestEffectEnd +	score 0x0A +	end +ContestEffect38_score2: +	score 0xF6 +	end + +ContestEffect47: +	if_move_used_count_eq 1 ContestEffectEnd +	contest_0E 0x00 ContestEffect47_random +	contest_0E 0x01 ContestEffect47_random +	contest_05 0x04 ContestEffectEnd +	if_user_has_exciting_move ContestEffectEnd +	contest_07 0x01 ContestEffectEnd +	score 0x0A +	end +ContestEffect47_random: +	if_random 0x7F ContestEffectEnd +	score 0x0A +	end + +ContestEffect31: +	contest_0E 0x01 ContestEffect31_score1 +	contest_0E 0x02 ContestEffect31_score2 +	contest_0E 0x03 ContestEffect31_score3 +	end +ContestEffect31_score1: +	score 0x05 +	end +ContestEffect31_score2: +	score 0x0F +	end +ContestEffect31_score3: +	score 0x14 +	end + +ContestEffect32: +	contest_0E 0x00 ContestEffect32_score1 +	contest_0E 0x01 ContestEffect32_score2 +	contest_0E 0x02 ContestEffect32_score3 +	contest_0E 0x03 ContestEffect32_score5 +	end +ContestEffect32_score1: +	score 0xF6 +	end +ContestEffect32_score2: +	contest_55 0x00 ContestEffectEnd +	score 0x05 +	end +ContestEffect32_score3: +	contest_55 0x00 ContestEffect32_score4 +	score 0x05 +	contest_7F ContestEffect32_score4 +	end +ContestEffect32_score4: +	contest_55 0x01 ContestEffectEnd +	score 0x05 +	end +ContestEffect32_score5: +	contest_55 0x00 ContestEffect32_score6 +	score 0x05 +	contest_7F ContestEffect32_score6 +	end +ContestEffect32_score6: +	contest_55 0x01 ContestEffect32_score7 +	score 0x05 +	contest_7F ContestEffect32_score7 +	end +ContestEffect32_score7: +	contest_55 0x02 ContestEffectEnd +	score 0x05 +	end + +ContestEffect46: +	contest_0E 0x00 ContestEffect46_05 +	contest_0D 0x00 ContestEffect46_score4 +	end +ContestEffect46_05: +	contest_05 0x00 ContestEffect46_score1 +	contest_09 0x04 ContestEffect46_score2 +	contest_09 0x03 ContestEffect46_score3 +	end +ContestEffect46_score1: +	if_random 0x7D ContestEffectEnd +	score 0xF1 +	end +ContestEffect46_score2: +	if_random 0x7D ContestEffectEnd +	score 0x14 +	end +ContestEffect46_score3: +	if_random 0x7D ContestEffectEnd +	score 0x0F +	end +ContestEffect46_score4: +	if_random 0xB2 ContestEffectEnd +	score 0x0A +	end + +ContestEffect27: +	contest_0E 0x00 ContestEffectEnd +	contest_7F ContestEffect27_55_1 +	end +ContestEffect27_55_1: +	contest_55 0x00 ContestEffect27_noscore +	contest_4C 0x00 0x00 ContestEffect27_noscore +	contest_4C 0x00 0x01 ContestEffect27_score1 +	contest_4C 0x00 0x02 ContestEffect27_score2 +	contest_4C 0x00 0x03 ContestEffect27_score3 +	end +ContestEffect27_score1: +	if_random 0x7D ContestEffect27_55_2 +	score 0x05  +	contest_0D 0x01 ContestEffect27_55_2 +	end +ContestEffect27_score2: +	if_random 0x7D ContestEffect27_55_2 +	score 0x0A  +	contest_0D 0x01 ContestEffect27_55_2 +	end +ContestEffect27_score3: +	if_random 0x7D ContestEffect27_55_2 +	score 0x0F  +	contest_0D 0x01 ContestEffect27_55_2 +	end +ContestEffect27_noscore: +	contest_0D 0x01 ContestEffect27_55_2 +	end +ContestEffect27_55_2: +	contest_55 0x01 ContestEffect27_noscore2 +	contest_4C 0x01 0x00 ContestEffect27_noscore2 +	contest_4C 0x01 0x01 ContestEffect27_score4 +	contest_4C 0x01 0x02 ContestEffect27_score5 +	contest_4C 0x01 0x03 ContestEffect27_score6 +	end +ContestEffect27_score4: +	if_random 0x7D ContestEffect27_55_3 +	score 0x05  +	contest_0D 0x02 ContestEffect27_55_3 +	end +ContestEffect27_score5: +	if_random 0x7D ContestEffect27_55_3 +	score 0x0A  +	contest_0D 0x02 ContestEffect27_55_3 +	end +ContestEffect27_score6: +	if_random 0x7D ContestEffect27_55_3 +	score 0x0F  +	contest_0D 0x02 ContestEffect27_55_3 +	end +ContestEffect27_noscore2: +	contest_0D 0x02 ContestEffect27_55_3 +	end +ContestEffect27_55_3: +	contest_55 0x02 ContestEffect27_end +	contest_4C 0x02 0x00 ContestEffect27_end +	contest_4C 0x02 0x01 ContestEffect27_score7 +	contest_4C 0x02 0x02 ContestEffect27_score8 +	contest_4C 0x02 0x03 ContestEffect27_score9 +	end +ContestEffect27_score7: +	if_random 0x7D ContestEffectEnd  +	score 0x05  +	end +ContestEffect27_score8: +	if_random 0x7D ContestEffectEnd  +	score 0x0A  +	end +ContestEffect27_score9: +	if_random 0x7D ContestEffectEnd  +	score 0x0F  +	end +ContestEffect27_end: +	end + +ContestEffect16or17: +	contest_0E 0x00 ContestEffectEnd +	contest_7F ContestEffect16or17_55 +	end +ContestEffect16or17_55: +	contest_55 0x00 ContestEffect16or17_0E_1 +	contest_51 0x00 0x01 ContestEffect16or17_0E_1 +	if_random 0x7D ContestEffect16or17_0E_1 +	score 0x02  +	contest_58 0x00 ContestEffect16or17_0E_1 +	score 0x08  +	end +ContestEffect16or17_0E_1: +	contest_0E 0x01 ContestEffectEnd +	contest_55 0x01 ContestEffect16or17_0E_2 +	contest_51 0x01 0x01 ContestEffect16or17_0E_2 +	if_random 0x7D ContestEffect16or17_0E_2 +	score 0x02  +	contest_58 0x01 ContestEffect16or17_0E_2 +	score 0x08  +	end +ContestEffect16or17_0E_2: +	contest_0E 0x02 ContestEffectEnd +	contest_55 0x02 ContestEffectEnd +	contest_51 0x02 0x01 ContestEffectEnd +	if_random 0x7D ContestEffectEnd +	score 0x02  +	contest_58 0x02 ContestEffectEnd +	score 0x08  +	end + +ContestEffect26: +	contest_0E 0x03 ContestEffectEnd +	contest_7F ContestEffect26_55 +	end +ContestEffect26_55: +	contest_55 0x03 ContestEffect26_0E_1 +	contest_51 0x03 0x00 ContestEffect26_0E_1 +	score 0x05  +	if_random 0x7D ContestEffect16or17_0E_1 +	score 0x05  +	end +ContestEffect26_0E_1: +	contest_0E 0x02 ContestEffectEnd +	contest_55 0x02 ContestEffect26_0E_2 +	contest_51 0x02 0x00 ContestEffect26_0E_2 +	score 0x05  +	if_random 0x7D ContestEffect16or17_0E_2 +	score 0x05 +	end +ContestEffect26_0E_2: +	contest_0E 0x01 ContestEffectEnd +	contest_55 0x01 ContestEffectEnd +	contest_51 0x01 0x00 ContestEffectEnd +	score 0x05  +	if_random 0x7D ContestEffectEnd +	score 0x05 +	end + +ContestEffect18: +	contest_04 0x04 ContestEffect18_score1 +	contest_7F ContestEffect18_0E +	end +ContestEffect18_score1: +	score 0x05  +	contest_7F ContestEffect18_0E +	end +ContestEffect18_0E: +	contest_0E 0x00 ContestEffect18_score2 +	contest_0E 0x01 ContestEffect18_random1 +	contest_0E 0x02 ContestEffect18_random2 +	contest_0E 0x03 ContestEffect18_random3 +	end +ContestEffect18_score2: +	score 0xF1  +	end +ContestEffect18_random1: +	if_random 0x7D ContestEffectEnd +	score 0xF6  +	end +ContestEffect18_random2: +	if_random 0x7D ContestEffectEnd +	score 0x05  +	end +ContestEffect18_random3: +	if_random 0x7D ContestEffectEnd +	score 0x0F  +	end + +ContestEffectEnd: +	end + +Unknown_081DC7DE: +	contest_20 0x02 AI_contest7D_081DC7DE +	contest_20 0x03 AI_contest7D_081DC7DE +	contest_20 0x04 AI_contest7D_081DC7DE +	end +AI_contest7D_081DC7DE: +	if_random 0x7D AI_end_081DC7DE +	score 0x0A +	end +AI_end_081DC7DE: +	end + +Unknown_081DC7FB: +	if_effect 8, ContestEffect2_8 +	if_effect 10, ContestEffect2_8 +	if_effect 12, ContestEffect2_8 +	if_effect 14, ContestEffect2_8 +	if_effect 32, ContestEffect2_8 +	if_effect 35, ContestEffect2_8 +	if_effect 36, ContestEffect2_8 +	if_effect 37, ContestEffect2_8 +	if_effect 9, ContestEffect2_9 +	if_effect 11, ContestEffect2_9 +	if_effect 13, ContestEffect2_9 +	if_effect 15, ContestEffect2_9 +	if_effect 17, ContestEffect2_9 +	if_effect 16, ContestEffect2_9 +	if_effect 18, ContestEffect2_9 +	if_effect 19, ContestEffect2_9 +	if_effect 45, ContestEffect2_9 +	if_effect 20, ContestEffect2_9 +	if_effect 21, ContestEffect2_9 +	if_effect 22, ContestEffect2_9 +	if_effect 23, ContestEffect2_9 +	if_effect 24, ContestEffect2_9 +	if_effect 28, ContestEffect2_9 +	if_effect 27, ContestEffect2_9 +	if_effect 31, ContestEffect2_9 +	if_effect 25, ContestEffect2_25 +	if_effect 26, ContestEffect2_26 +	if_effect 47, ContestEffect2_26 +	if_effect 38, ContestEffect2_38 +	if_effect 4, ContestEffect2_4 +	if_effect 5, ContestEffect2_4 +	if_effect 6, ContestEffect2_4 +	if_effect 2, ContestEffect2_2 +	end + +ContestEffect2_8: +	contest_0E 0x00 ContestEffect2_8_score1 +	contest_0E 0x01 ContestEffect2_8_score2 +	contest_0E 0x02 ContestEffect2_8_score3 +	contest_0E 0x03 ContestEffect2_8_score4 +	end +ContestEffect2_8_score1: +	score 0xF6 +	end +ContestEffect2_8_score2: +	contest_54 0x00 ContestEffectEnd2 +	score 0xF6 +	end +ContestEffect2_8_score3: +	contest_54 0x01 ContestEffectEnd2 +	score 0xF6 +	end +ContestEffect2_8_score4: +	contest_54 0x02 ContestEffectEnd2 +	score 0xF6 +	end + +ContestEffect2_9: +	contest_0E 0x00 ContestEffect2_9_score1 +	contest_0E 0x01 ContestEffect2_9_score2 +	contest_0E 0x02 ContestEffect2_9_score3 +	contest_0E 0x03 ContestEffect2_9_score4 +	end +ContestEffect2_9_score1: +	score 0xEC  +	end +ContestEffect2_9_score2: +	contest_54 0x00 ContestEffectEnd2 +	score 0xF1  +	end +ContestEffect2_9_score3: +	contest_54 0x00 ContestEffectEnd2 +	contest_54 0x01 ContestEffectEnd2 +	score 0xF1  +	end +ContestEffect2_9_score4: +	contest_54 0x00 ContestEffectEnd2 +	contest_54 0x01 ContestEffectEnd2 +	contest_54 0x02 ContestEffectEnd2 +	score 0xF1  +	end + +ContestEffect2_25: +	contest_0E 0x00 ContestEffect2_25_score1 +	contest_0E 0x01 ContestEffect2_25_score2 +	contest_0E 0x02 ContestEffect2_25_score3 +	score 0xF6  +	end +ContestEffect2_25_score1: +	contest_54 0x01 ContestEffectEnd2 +	score 0xF6  +	end +ContestEffect2_25_score2: +	contest_54 0x02 ContestEffectEnd2 +	score 0xF6  +	end +ContestEffect2_25_score3: +	contest_54 0x03 ContestEffectEnd2 +	score 0xF6  +	end + +ContestEffect2_26: +	contest_0E 0x00 ContestEffect2_26_score1 +	contest_0E 0x01 ContestEffect2_26_score2 +	contest_0E 0x02 ContestEffect2_26_score3 +	score 0xF6  +	end +ContestEffect2_26_score1: +	contest_54 0x01 ContestEffectEnd2 +	contest_54 0x02 ContestEffectEnd2 +	contest_54 0x03 ContestEffectEnd2 +	score 0xF6  +	end +ContestEffect2_26_score2: +	contest_54 0x02 ContestEffectEnd2 +	contest_54 0x03 ContestEffectEnd2 +	score 0xF6  +	end +ContestEffect2_26_score3: +	contest_54 0x03 ContestEffectEnd2 +	score 0xF6  +	end + +ContestEffect2_38: +	if_user_condition_less_than 0x03 ContestEffectEnd2 +	score 0xEC +	end + +ContestEffect2_4: +	contest_0E 0x00 ContestEffect2_4_score1 +	contest_0E 0x01 ContestEffect2_4_score2 +	contest_0E 0x02 ContestEffect2_4_score3 +	score 0xF6  +	end +ContestEffect2_4_score1: +	contest_54 0x01 ContestEffectEnd2 +	contest_54 0x02 ContestEffectEnd2 +	contest_54 0x03 ContestEffectEnd2 +	score 0xF6  +	end +ContestEffect2_4_score2: +	contest_54 0x02 ContestEffectEnd2 +	contest_54 0x03 ContestEffectEnd2 +	score 0xF6  +	end +ContestEffect2_4_score3: +	contest_54 0x03 ContestEffectEnd2 +	score 0xF6  +	end + +ContestEffect2_2: +	contest_04 0x00 ContestEffect2_2_score1 +	contest_04 0x01 ContestEffect2_2_score2 +	contest_04 0x02 ContestEffect2_2_score3 +	contest_04 0x03 ContestEffect2_2_score4 +	contest_04 0x04 ContestEffect2_2_score5 +	end +ContestEffect2_2_score1: +	if_random 0x14 ContestEffectEnd2 +	score 0xF1  +	end +ContestEffect2_2_score2: +	if_random 0x28 ContestEffectEnd2 +	score 0xF1  +	end +ContestEffect2_2_score3: +	if_random 0x3C ContestEffectEnd2 +	score 0xF1  +	end +ContestEffect2_2_score4: +	if_random 0x50 ContestEffectEnd2 +	score 0xF1  +	end +ContestEffect2_2_score5: +	if_random 0x14 ContestEffectEnd2 +	score 0x14  +	end +	 +ContestEffectEnd2: +	end + +Unknown_081DCA4C: +	contest_0E 0x00 AI_effectcheck1_081DCA4C +	contest_0E 0x01 AI_effectcheck2_081DCA4C +	contest_0E 0x02 AI_effectcheck3_081DCA4C +	contest_0E 0x03 AI_effectcheck4_081DCA4C +	end +AI_effectcheck1_081DCA4C: +	if_effect 0x1D AI_score1_081DCA4C +	if_effect 0x21 AI_score2_081DCA4C +	contest_2B 0x01 AI_random1_081DCA4C +	end +AI_score1_081DCA4C: +	score 0x0F  +	end +AI_score2_081DCA4C: +	score 0xF1  +	end +AI_random1_081DCA4C: +	if_random 0x64 ContestEffectEnd2 +	score 0x0A  +	end +AI_effectcheck2_081DCA4C: +	if_effect 0x21 AI_score3_081DCA4C +	contest_2B 0x01 AI_random2_081DCA4C +	end +AI_score3_081DCA4C: +	score 0xFB  +	end +AI_random2_081DCA4C: +	if_random 0x7D ContestEffectEnd2 +	score 0x0A  +	end +AI_effectcheck3_081DCA4C: +	if_effect 0x21 AI_score4_081DCA4C +	if_effect 0x1F AI_score4_081DCA4C  +	if_effect 0x01 AI_score4_081DCA4C +	end +AI_score4_081DCA4C: +	score 0x05  +	end +AI_effectcheck4_081DCA4C: +	if_effect 0x21 AI_score5_081DCA4C +	if_effect 0x1E AI_score5_081DCA4C +	if_effect 0x1F AI_score5_081DCA4C +	if_effect 0x01 AI_score5_081DCA4C +	if_effect 0x12 AI_score7_081DCA4C +	contest_2B 0x01 AI_score6_081DCA4C +	contest_2B 0x03 AI_random3_081DCA4C +	end +AI_score5_081DCA4C: +	score 0x0F  +	end +AI_score6_081DCA4C: +	score 0xF6  +	end +AI_random3_081DCA4C: +	if_random 0x7D ContestEffectEnd2 +	score 0x0A  +	end +AI_score7_081DCA4C: +	score 0x05  +	end + +Unknown_081DCAF3: +	end diff --git a/data/text/battle_strings.s b/data/text/battle_strings.s index e8baa88ab..e9195e261 100644 --- a/data/text/battle_strings.s +++ b/data/text/battle_strings.s @@ -1860,8 +1860,7 @@ gUnknown_0840164C:: @ 840164C  	.2byte BATTLE_TEXT_SubTookDamage  	.2byte BATTLE_TEXT_CoinScatter  	.2byte BATTLE_TEXT_SandTombTrapped - -	.incbin "baserom.gba", 0x401658, 0x4 +	.2byte 0xFFFF  	.align 2  gUnknown_0840165C:: @ 840165C | 
