summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xasm/macros/contest_ai_script.s59
-rw-r--r--data/contest_ai_scripts.s56
2 files changed, 106 insertions, 9 deletions
diff --git a/asm/macros/contest_ai_script.s b/asm/macros/contest_ai_script.s
index da274767e..9da6a260c 100755
--- a/asm/macros/contest_ai_script.s
+++ b/asm/macros/contest_ai_script.s
@@ -20,8 +20,19 @@
@ 06
@ 07
@ 08
-@ 09
-@ 0A
+
+ .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
@ 0D
@@ -32,7 +43,12 @@
.4byte \addr
.endm
-@ 0F
+ .macro contest_0F param addr
+ .byte 0x0F
+ .byte \param
+ .4byte \addr
+ .endm
+
@ 10
@ 11
@ 12
@@ -58,9 +74,21 @@
@ 21
@ 22
-@ 23
+
+ .macro contest_23 param addr
+ .byte 0x23
+ .byte \param
+ .4byte \addr
+ .endm
+
@ 24
-@ 25
+
+ .macro contest_25 param addr
+ .byte 0x25
+ .byte \param
+ .4byte \addr
+ .endm
+
@ 26
@ 27
@@ -70,7 +98,12 @@
.4byte \addr
.endm
-@ 29
+ .macro contest_29 param addr
+ .byte 0x29
+ .byte \param
+ .4byte \addr
+ .endm
+
@ 2A
@ 2B
@ 2C
@@ -90,7 +123,12 @@
@ 3A
@ 3B
@ 3C
-@ 3D
+
+ .macro contest_3D param addr
+ .byte 0x3D
+ .byte \param
+ .4byte \addr
+ .endm
.macro contest_3E param addr
.byte 0x3E
@@ -200,7 +238,12 @@
.endm
@ 82
-@ 83
+
+ .macro contest_83 addr
+ .byte 0x83
+ .4byte \addr
+ .endm
+
@ 84
@ 85
@ 86
diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s
index 560a43b7c..d4acbaab8 100644
--- a/data/contest_ai_scripts.s
+++ b/data/contest_ai_scripts.s
@@ -61,7 +61,61 @@ AI_score4_081DC27F:
AI_end_081DC27F:
end
Unknown_081DC2AB:
- .incbin "baserom.gba", 0x001dc2ab, 0x9D
+ 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
+ contest_83 AI_end_081DC2AB
+ score 0x0F
+ end
+AI_contest0F_1_081DC2AB:
+ contest_0F 0x00 AI_contest7D_1_081DC2AB
+ contest_7D 0x33 AI_end_081DC2AB
+ score 0x14
+ end
+AI_contest7D_1_081DC2AB:
+ contest_7D 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:
+ contest_7D 0x33 AI_end_081DC2AB
+ score 0x0A
+ end
+AI_score_081DC2AB:
+ score 0x0F
+ end
+AI_contest7D_3_081DC2AB:
+ contest_7D 0x7F AI_end_081DC2AB
+ score 0x0A
+ end
+AI_contest7D_4_081DC2AB:
+ contest_7D 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:
+ contest_7D 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