summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-03-29 10:24:30 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2018-03-29 10:24:30 -0400
commit8a61d647fc81ca392dbcf7458db5b528a1a744a6 (patch)
tree86bb74a82eee51d49e1fe3d7051449abc59a9f7b
parent7eb178c36e5d4c5dba5f600346228969f4e33b9a (diff)
through ContestEffect_08
-rw-r--r--asm/contest_effect.s343
-rw-r--r--include/contest.h7
-rw-r--r--src/contest.c14
-rw-r--r--src/contest_effect.c62
4 files changed, 138 insertions, 288 deletions
diff --git a/asm/contest_effect.s b/asm/contest_effect.s
index 57ff6dfd0..523f4d85b 100644
--- a/asm/contest_effect.s
+++ b/asm/contest_effect.s
@@ -5,217 +5,6 @@
.text
- thumb_func_start ContestEffect_02
-ContestEffect_02: @ 80B7DBC
- push {lr}
- ldr r3, _080B7DE4 @ =gSharedMem + 0x192D0
- ldrb r1, [r3, 0x11]
- lsls r0, r1, 3
- subs r0, r1
- lsls r0, 2
- adds r1, r3, 0
- subs r1, 0x70
- adds r0, r1
- ldrb r1, [r0, 0x11]
- movs r2, 0x8
- orrs r1, r2
- strb r1, [r0, 0x11]
- ldrb r0, [r3, 0x11]
- movs r1, 0x1
- bl sub_80B13EC
- pop {r0}
- bx r0
- .align 2, 0
-_080B7DE4: .4byte gSharedMem + 0x192D0
- thumb_func_end ContestEffect_02
-
- thumb_func_start ContestEffect_03
-ContestEffect_03: @ 80B7DE8
- push {r4,lr}
- ldr r3, _080B7E30 @ =gSharedMem + 0x192D0
- ldrb r1, [r3, 0x11]
- lsls r0, r1, 3
- subs r0, r1
- lsls r0, 2
- adds r4, r3, 0
- subs r4, 0x70
- adds r0, r4
- ldrb r1, [r0, 0x10]
- movs r2, 0x8
- orrs r1, r2
- strb r1, [r0, 0x10]
- ldrb r0, [r3, 0x11]
- lsls r1, r0, 3
- subs r1, r0
- lsls r1, 2
- adds r1, r4
- ldrb r2, [r1, 0x15]
- movs r0, 0x2
- negs r0, r0
- ands r0, r2
- strb r0, [r1, 0x15]
- ldrb r0, [r3, 0x11]
- lsls r1, r0, 3
- subs r1, r0
- lsls r1, 2
- adds r1, r4
- ldrb r2, [r1, 0xB]
- movs r0, 0x71
- negs r0, r0
- ands r0, r2
- strb r0, [r1, 0xB]
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_080B7E30: .4byte gSharedMem + 0x192D0
- thumb_func_end ContestEffect_03
-
- thumb_func_start ContestEffect_04
-ContestEffect_04: @ 80B7E34
- push {lr}
- ldr r2, _080B7E58 @ =gSharedMem + 0x192D0
- ldrb r1, [r2, 0x11]
- lsls r0, r1, 3
- subs r0, r1
- lsls r0, 2
- adds r1, r2, 0
- subs r1, 0x70
- adds r0, r1
- movs r1, 0x1
- strb r1, [r0, 0x12]
- ldrb r0, [r2, 0x11]
- movs r1, 0x2
- bl sub_80B13EC
- pop {r0}
- bx r0
- .align 2, 0
-_080B7E58: .4byte gSharedMem + 0x192D0
- thumb_func_end ContestEffect_04
-
- thumb_func_start ContestEffect_05
-ContestEffect_05: @ 80B7E5C
- push {lr}
- ldr r3, _080B7E84 @ =gSharedMem + 0x192D0
- ldrb r1, [r3, 0x11]
- lsls r0, r1, 3
- subs r0, r1
- lsls r0, 2
- adds r1, r3, 0
- subs r1, 0x70
- adds r0, r1
- ldrb r1, [r0, 0x10]
- movs r2, 0x2
- orrs r1, r2
- strb r1, [r0, 0x10]
- ldrb r0, [r3, 0x11]
- movs r1, 0x3
- bl sub_80B13EC
- pop {r0}
- bx r0
- .align 2, 0
-_080B7E84: .4byte gSharedMem + 0x192D0
- thumb_func_end ContestEffect_05
-
- thumb_func_start ContestEffect_06
-ContestEffect_06: @ 80B7E88
- push {lr}
- ldr r2, _080B7EAC @ =gSharedMem + 0x192D0
- ldrb r1, [r2, 0x11]
- lsls r0, r1, 3
- subs r0, r1
- lsls r0, 2
- adds r1, r2, 0
- subs r1, 0x70
- adds r0, r1
- movs r1, 0x14
- strb r1, [r0, 0xF]
- ldrb r0, [r2, 0x11]
- movs r1, 0x4
- bl sub_80B13EC
- pop {r0}
- bx r0
- .align 2, 0
-_080B7EAC: .4byte gSharedMem + 0x192D0
- thumb_func_end ContestEffect_06
-
- thumb_func_start ContestEffect_07
-ContestEffect_07: @ 80B7EB0
- push {lr}
- ldr r3, _080B7ED8 @ =gSharedMem + 0x192D0
- ldrb r1, [r3, 0x11]
- lsls r0, r1, 3
- subs r0, r1
- lsls r0, 2
- adds r1, r3, 0
- subs r1, 0x70
- adds r0, r1
- ldrb r1, [r0, 0x10]
- movs r2, 0x1
- orrs r1, r2
- strb r1, [r0, 0x10]
- ldrb r0, [r3, 0x11]
- movs r1, 0x5
- bl sub_80B13EC
- pop {r0}
- bx r0
- .align 2, 0
-_080B7ED8: .4byte gSharedMem + 0x192D0
- thumb_func_end ContestEffect_07
-
- thumb_func_start ContestEffect_08
-ContestEffect_08: @ 80B7EDC
- push {r4,lr}
- movs r2, 0
- ldr r3, _080B7F38 @ =gSharedMem + 0x192D0
- ldrb r0, [r3, 0x11]
- adds r1, r0, r3
- ldrb r0, [r1]
- cmp r0, 0
- beq _080B7F1A
- subs r0, 0x1
- ldrb r4, [r3]
- cmp r0, r4
- beq _080B7F0A
- adds r4, r3, 0
- adds r3, r1, 0
-_080B7EF8:
- adds r2, 0x1
- cmp r2, 0x3
- bgt _080B7F0A
- ldrb r0, [r3]
- subs r0, 0x1
- adds r1, r2, r4
- ldrb r1, [r1]
- cmp r0, r1
- bne _080B7EF8
-_080B7F0A:
- ldr r1, _080B7F38 @ =gSharedMem + 0x192D0
- strb r2, [r1, 0x8]
- movs r0, 0xFF
- strb r0, [r1, 0x9]
- bl sub_80B9120
- lsls r0, 24
- lsrs r2, r0, 24
-_080B7F1A:
- cmp r2, 0
- bne _080B7F28
- ldr r0, _080B7F38 @ =gSharedMem + 0x192D0
- ldrb r0, [r0, 0x11]
- movs r1, 0x36
- bl sub_80B1404
-_080B7F28:
- ldr r0, _080B7F38 @ =gSharedMem + 0x192D0
- ldrb r0, [r0, 0x11]
- movs r1, 0x30
- bl sub_80B13EC
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_080B7F38: .4byte gSharedMem + 0x192D0
- thumb_func_end ContestEffect_08
-
thumb_func_start ContestEffect_09
ContestEffect_09: @ 80B7F3C
push {r4-r6,lr}
@@ -257,12 +46,12 @@ _080B7F7C:
ldr r0, _080B7F9C @ =gSharedMem + 0x192D0
ldrb r0, [r0, 0x11]
movs r1, 0x36
- bl sub_80B1404
+ bl SetContestantStatusUnk14
_080B7F8A:
ldr r0, _080B7F9C @ =gSharedMem + 0x192D0
ldrb r0, [r0, 0x11]
movs r1, 0x30
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
pop {r4-r6}
pop {r0}
bx r0
@@ -362,13 +151,13 @@ _080B804A:
mov r1, r8
ldrb r0, [r1, 0x11]
movs r1, 0x30
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
cmp r7, 0
bne _080B8062
mov r1, r8
ldrb r0, [r1, 0x11]
movs r1, 0x36
- bl sub_80B1404
+ bl SetContestantStatusUnk14
_080B8062:
pop {r3}
mov r8, r3
@@ -429,7 +218,7 @@ _080B8094:
strb r0, [r5]
adds r0, r4, 0
movs r1, 0x8
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
movs r0, 0x1
mov r9, r0
_080B80D8:
@@ -441,14 +230,14 @@ _080B80E0:
mov r1, r10
ldrb r0, [r1, 0x11]
movs r1, 0x7
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
mov r2, r9
cmp r2, 0
bne _080B80FA
mov r1, r10
ldrb r0, [r1, 0x11]
movs r1, 0x36
- bl sub_80B1404
+ bl SetContestantStatusUnk14
_080B80FA:
pop {r3-r5}
mov r8, r3
@@ -525,13 +314,13 @@ _080B8172:
_080B817C:
ldrb r0, [r6, 0x11]
movs r1, 0x30
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
mov r0, r9
cmp r0, 0
bne _080B8192
ldrb r0, [r6, 0x11]
movs r1, 0x36
- bl sub_80B1404
+ bl SetContestantStatusUnk14
_080B8192:
pop {r3,r4}
mov r8, r3
@@ -561,7 +350,7 @@ ContestEffect_18: @ 80B81A4
bl ContestEffect_09
ldrb r0, [r4, 0x11]
movs r1, 0x30
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
pop {r4}
pop {r0}
bx r0
@@ -590,7 +379,7 @@ ContestEffect_19: @ 80B81D4
bl sub_80B9038
ldrb r0, [r4, 0x11]
movs r1, 0x30
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
pop {r4}
pop {r0}
bx r0
@@ -607,7 +396,7 @@ ContestEffect_20: @ 80B8210
ldr r0, _080B8228 @ =gSharedMem + 0x192D0
ldrb r0, [r0, 0x11]
movs r1, 0x30
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
pop {r0}
bx r0
.align 2, 0
@@ -622,7 +411,7 @@ ContestEffect_21: @ 80B822C
ldr r0, _080B8244 @ =gSharedMem + 0x192D0
ldrb r0, [r0, 0x11]
movs r1, 0x30
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
pop {r0}
bx r0
.align 2, 0
@@ -637,7 +426,7 @@ ContestEffect_22: @ 80B8248
ldr r0, _080B8260 @ =gSharedMem + 0x192D0
ldrb r0, [r0, 0x11]
movs r1, 0x30
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
pop {r0}
bx r0
.align 2, 0
@@ -652,7 +441,7 @@ ContestEffect_23: @ 80B8264
ldr r0, _080B827C @ =gSharedMem + 0x192D0
ldrb r0, [r0, 0x11]
movs r1, 0x30
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
pop {r0}
bx r0
.align 2, 0
@@ -667,7 +456,7 @@ ContestEffect_24: @ 80B8280
ldr r0, _080B8298 @ =gSharedMem + 0x192D0
ldrb r0, [r0, 0x11]
movs r1, 0x30
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
pop {r0}
bx r0
.align 2, 0
@@ -714,7 +503,7 @@ _080B82E4:
adds r0, r4, 0
movs r1, 0x3C
_080B82E8:
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
movs r4, 0x1
_080B82EE:
adds r5, 0x1
@@ -723,12 +512,12 @@ _080B82EE:
_080B82F4:
ldrb r0, [r7, 0x11]
movs r1, 0x9
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
cmp r4, 0
bne _080B8308
ldrb r0, [r7, 0x11]
movs r1, 0x36
- bl sub_80B1404
+ bl SetContestantStatusUnk14
_080B8308:
pop {r4-r7}
pop {r0}
@@ -922,7 +711,7 @@ _080B8442:
bl sub_80B157C
ldrb r0, [r4]
movs r1, 0xA
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
mov r0, r9
adds r0, 0x1
lsls r0, 24
@@ -943,7 +732,7 @@ _080B84A2:
str r2, [sp, 0x18]
ldrb r0, [r4]
movs r1, 0x3C
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
mov r0, r9
adds r0, 0x1
lsls r0, 24
@@ -963,13 +752,13 @@ _080B84CA:
ldr r4, _080B84F4 @ =gSharedMem + 0x192D0
ldrb r0, [r4, 0x11]
movs r1, 0xB
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
mov r3, r9
cmp r3, 0
bne _080B84E2
ldrb r0, [r4, 0x11]
movs r1, 0x36
- bl sub_80B1404
+ bl SetContestantStatusUnk14
_080B84E2:
add sp, 0x1C
pop {r3-r5}
@@ -1025,7 +814,7 @@ _080B850A:
strb r1, [r5, 0x3]
adds r0, r4, 0
movs r1, 0xD
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
mov r0, r8
adds r0, 0x1
lsls r0, 24
@@ -1039,13 +828,13 @@ _080B8556:
ldr r4, _080B8580 @ =gSharedMem + 0x192D0
ldrb r0, [r4, 0x11]
movs r1, 0xC
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
mov r0, r8
cmp r0, 0
bne _080B8576
ldrb r0, [r4, 0x11]
movs r1, 0x39
- bl sub_80B1404
+ bl SetContestantStatusUnk14
_080B8576:
pop {r3}
mov r8, r3
@@ -1105,12 +894,12 @@ _080B85CE:
ldr r4, _080B85F4 @ =gSharedMem + 0x192D0
ldrb r0, [r4, 0x11]
movs r1, 0xE
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
cmp r7, 0
bne _080B85EC
ldrb r0, [r4, 0x11]
movs r1, 0x39
- bl sub_80B1404
+ bl SetContestantStatusUnk14
_080B85EC:
pop {r4-r7}
pop {r0}
@@ -1150,7 +939,7 @@ ContestEffect_29: @ 80B85F8
strh r0, [r1, 0x2]
ldrb r0, [r4, 0x11]
movs r1, 0xF
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
_080B8636:
pop {r4}
pop {r0}
@@ -1193,7 +982,7 @@ ContestEffect_30: @ 80B864C
strh r0, [r1, 0x2]
ldrb r0, [r4, 0x11]
movs r1, 0x10
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
_080B868A:
pop {r4}
pop {r0}
@@ -1246,7 +1035,7 @@ _080B86D2:
_080B86E2:
adds r0, r2, 0
movs r1, 0x12
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
b _080B8710
.align 2, 0
_080B86EC: .4byte gSharedMem + 0x192D0
@@ -1265,7 +1054,7 @@ _080B86F0:
strh r0, [r1, 0x2]
ldrb r0, [r4, 0x11]
movs r1, 0x11
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
_080B8710:
ldr r4, _080B873C @ =gSharedMem + 0x192D0
ldrb r1, [r4, 0x11]
@@ -1334,7 +1123,7 @@ _080B876C:
_080B8788:
ldrb r0, [r4, 0x11]
movs r1, 0x14
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
b _080B87B2
.align 2, 0
_080B8794: .4byte gSharedMem + 0x192D0
@@ -1350,7 +1139,7 @@ _080B8798:
strh r0, [r1, 0x2]
ldrb r0, [r4, 0x11]
movs r1, 0x13
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
_080B87B2:
pop {r4-r7}
pop {r0}
@@ -1394,7 +1183,7 @@ _080B87EE:
mov r1, r12
ldrb r0, [r1, 0x11]
movs r1, 0x15
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
b _080B882A
_080B8800:
cmp r3, 0x1
@@ -1402,7 +1191,7 @@ _080B8800:
mov r1, r12
ldrb r0, [r1, 0x11]
movs r1, 0x16
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
b _080B882A
_080B8810:
cmp r3, 0x2
@@ -1410,13 +1199,13 @@ _080B8810:
mov r1, r12
ldrb r0, [r1, 0x11]
movs r1, 0x17
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
b _080B882A
_080B8820:
mov r1, r12
ldrb r0, [r1, 0x11]
movs r1, 0x18
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
_080B882A:
pop {r0}
bx r0
@@ -1439,7 +1228,7 @@ ContestEffect_34: @ 80B8830
ldr r0, _080B8858 @ =gSharedMem + 0x192D0
ldrb r0, [r0, 0x11]
movs r1, 0x1A
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
b _080B88B0
.align 2, 0
_080B8858: .4byte gSharedMem + 0x192D0
@@ -1450,7 +1239,7 @@ _080B885C:
ldr r0, _080B8870 @ =gSharedMem + 0x192D0
ldrb r0, [r0, 0x11]
movs r1, 0x1B
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
b _080B88B0
.align 2, 0
_080B8870: .4byte gSharedMem + 0x192D0
@@ -1461,7 +1250,7 @@ _080B8874:
ldr r0, _080B8888 @ =gSharedMem + 0x192D0
ldrb r0, [r0, 0x11]
movs r1, 0x1C
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
b _080B88B0
.align 2, 0
_080B8888: .4byte gSharedMem + 0x192D0
@@ -1472,7 +1261,7 @@ _080B888C:
ldr r0, _080B88A0 @ =gSharedMem + 0x192D0
ldrb r0, [r0, 0x11]
movs r1, 0x1D
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
b _080B88B0
.align 2, 0
_080B88A0: .4byte gSharedMem + 0x192D0
@@ -1481,7 +1270,7 @@ _080B88A4:
ldr r0, _080B88C8 @ =gSharedMem + 0x192D0
ldrb r0, [r0, 0x11]
movs r1, 0x1E
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
_080B88B0:
ldr r0, _080B88C8 @ =gSharedMem + 0x192D0
ldrb r2, [r0, 0x11]
@@ -1603,7 +1392,7 @@ _080B8944:
mov r2, r12
ldrb r0, [r2, 0x11]
movs r1, 0x1F
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
_080B8994:
pop {r4-r7}
pop {r0}
@@ -1679,7 +1468,7 @@ _080B89D4:
strh r0, [r1, 0x2]
ldrb r0, [r6, 0x11]
movs r1, 0x20
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
b _080B8A3C
.align 2, 0
_080B8A28: .4byte gSharedMem + 0x192D0
@@ -1737,7 +1526,7 @@ _080B8A60:
strh r0, [r2, 0x2]
ldrb r0, [r4, 0x11]
movs r1, 0x21
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
b _080B8AA8
.align 2, 0
_080B8A94: .4byte gSharedMem + 0x192D0
@@ -1748,7 +1537,7 @@ _080B8A98:
strh r0, [r2, 0x2]
ldrb r0, [r4, 0x11]
movs r1, 0x22
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
_080B8AA8:
adds r6, 0x1C
adds r5, 0x1
@@ -1793,14 +1582,14 @@ ContestEffect_38: @ 80B8AB8
strb r1, [r0, 0x10]
ldrb r0, [r4, 0x11]
movs r1, 0x23
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
b _080B8B08
.align 2, 0
_080B8AFC: .4byte gSharedMem + 0x192D0
_080B8B00:
adds r0, r2, 0
movs r1, 0x3A
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
_080B8B08:
pop {r4,r5}
pop {r0}
@@ -1834,14 +1623,14 @@ ContestEffect_39: @ 80B8B10
beq _080B8B4C
adds r0, r1, 0
movs r1, 0x24
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
b _080B8B54
.align 2, 0
_080B8B48: .4byte gSharedMem + 0x192D0
_080B8B4C:
adds r0, r1, 0
movs r1, 0x3B
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
_080B8B54:
pop {r4}
pop {r0}
@@ -1996,7 +1785,7 @@ _080B8C32:
strb r0, [r1, 0x11]
ldrb r0, [r7, 0x11]
movs r1, 0x25
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
_080B8C76:
add sp, 0x4
pop {r3}
@@ -2158,7 +1947,7 @@ _080B8D62:
strb r0, [r1, 0x11]
ldrb r0, [r7, 0x11]
movs r1, 0x26
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
_080B8DA6:
add sp, 0x4
pop {r3,r4}
@@ -2301,7 +2090,7 @@ _080B8E66:
strb r1, [r0, 0x11]
ldrb r0, [r4, 0x11]
movs r1, 0x27
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
_080B8EAE:
add sp, 0x8
pop {r4-r7}
@@ -2401,12 +2190,12 @@ _080B8F52:
ldr r0, _080B8F78 @ =gSharedMem + 0x192D0
ldrb r0, [r0, 0x11]
movs r1, 0x36
- bl sub_80B1404
+ bl SetContestantStatusUnk14
_080B8F68:
ldr r0, _080B8F78 @ =gSharedMem + 0x192D0
ldrb r0, [r0, 0x11]
movs r1, 0x30
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
pop {r4-r7}
pop {r0}
bx r0
@@ -2426,7 +2215,7 @@ ContestEffect_46: @ 80B8F7C
adds r0, 0xCC
ldrb r0, [r0, 0x11]
movs r1, 0x1A
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
b _080B8FDE
.align 2, 0
_080B8F98: .4byte gSharedMem + 0x19204
@@ -2437,7 +2226,7 @@ _080B8F9C:
adds r0, 0xCC
ldrb r0, [r0, 0x11]
movs r1, 0x1B
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
b _080B8FDE
_080B8FAE:
cmp r1, 0x2
@@ -2446,7 +2235,7 @@ _080B8FAE:
adds r0, 0xCC
ldrb r0, [r0, 0x11]
movs r1, 0x1C
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
b _080B8FDE
_080B8FC0:
cmp r1, 0x3
@@ -2455,14 +2244,14 @@ _080B8FC0:
adds r0, 0xCC
ldrb r0, [r0, 0x11]
movs r1, 0x1D
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
b _080B8FDE
_080B8FD2:
movs r4, 0x3C
adds r0, 0xCC
ldrb r0, [r0, 0x11]
movs r1, 0x1E
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
_080B8FDE:
ldr r0, _080B8FF4 @ =gSharedMem + 0x192D0
ldrb r2, [r0, 0x11]
@@ -2506,7 +2295,7 @@ ContestEffect_47: @ 80B8FF8
mov r1, r12
ldrb r0, [r1, 0x11]
movs r1, 0x3D
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
_080B902E:
pop {r0}
bx r0
@@ -2575,7 +2364,7 @@ _080B909A:
ldr r0, _080B90BC @ =gSharedMem + 0x192D0
ldrb r0, [r0, 0x11]
movs r1, 0x36
- bl sub_80B1404
+ bl SetContestantStatusUnk14
_080B90B0:
pop {r3,r4}
mov r8, r3
@@ -2635,7 +2424,7 @@ _080B910E:
adds r0, r3, 0
movs r1, 0x2C
_080B9116:
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
_080B911A:
movs r0, 0
_080B911C:
@@ -2696,7 +2485,7 @@ _080B9174:
strh r0, [r5, 0x6]
adds r0, r4, 0
movs r1, 0x2F
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
b _080B91C8
.align 2, 0
_080B918C: .4byte gSharedMem + 0x192D0
@@ -2712,7 +2501,7 @@ _080B9190:
strh r3, [r5, 0x6]
adds r0, r4, 0
movs r1, 0x2E
- bl sub_80B13EC
+ bl SetContestantStatusUnk13
b _080B91C8
_080B91AC:
lsls r1, 24
diff --git a/include/contest.h b/include/contest.h
index f8879f8a5..241fd19fc 100644
--- a/include/contest.h
+++ b/include/contest.h
@@ -227,7 +227,9 @@ struct UnknownContestStruct7
u8 unk0[4];
u16 unk4;
u16 unk6;
- u8 filler8[0xD-8];
+ u8 unk8;
+ u8 unk9;
+ u8 fillerA[3];
u8 unkD[4];
u8 unk11;
u8 filler12[2];
@@ -277,6 +279,7 @@ extern u16 gUnknown_02038688[4];
extern u8 gContestFinalStandings[4];
extern u8 gUnknown_02038696[4];
extern u8 gUnknown_0203869B;
-void sub_80B13EC(u8 a, u8 b);
+void SetContestantStatusUnk13(u8 a, u8 b);
+void SetContestantStatusUnk14(u8 a, u8 b);
#endif // GUARD_CONTEST_H
diff --git a/src/contest.c b/src/contest.c
index c27844beb..77455e882 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -4625,12 +4625,12 @@ void sub_80B114C(u8 contestant)
}
}
-void sub_80B13EC(u8 a, u8 b)
+void SetContestantStatusUnk13(u8 a, u8 b)
{
sContestantStatus[a].unk13 = b;
}
-void sub_80B1404(u8 a, u8 b)
+void SetContestantStatusUnk14(u8 a, u8 b)
{
sContestantStatus[a].unk14 = b;
}
@@ -4638,15 +4638,15 @@ void sub_80B1404(u8 a, u8 b)
void sub_80B141C(u8 a, u8 b)
{
if (b >= 60)
- sub_80B13EC(a, 53);
+ SetContestantStatusUnk13(a, 53);
else if (b >= 40)
- sub_80B13EC(a, 52);
+ SetContestantStatusUnk13(a, 52);
else if (b >= 30)
- sub_80B13EC(a, 51);
+ SetContestantStatusUnk13(a, 51);
else if (b >= 20)
- sub_80B13EC(a, 50);
+ SetContestantStatusUnk13(a, 50);
else if (b >= 10)
- sub_80B13EC(a, 49);
+ SetContestantStatusUnk13(a, 49);
}
void sub_80B146C(u8 a, u8 b)
diff --git a/src/contest_effect.c b/src/contest_effect.c
index f1606517b..abc630dd8 100644
--- a/src/contest_effect.c
+++ b/src/contest_effect.c
@@ -2,8 +2,12 @@
#include "ewram.h"
#include "contest.h"
+u8 sub_80B9120(void);
+
extern bool8 const gComboStarterLookupTable[];
+#define curContestant (&sContestantStatus[shared192D0.unk11])
+
bool8 AreMovesContestCombo(u16 lastMove, u16 nextMove) {
u8 nextMoveComboMoves[4];
u8 lastMoveComboStarterId = gContestMoves[lastMove].comboStarterId;
@@ -27,7 +31,61 @@ void ContestEffect_00(void)
void ContestEffect_01(void)
{
- sContestantStatus[shared192D0.unk11].unk10_2 = TRUE;
- sub_80B13EC(shared192D0.unk11, 0);
+ curContestant->unk10_2 = TRUE;
+ SetContestantStatusUnk13(shared192D0.unk11, 0);
+}
+
+void ContestEffect_02(void)
+{
+ curContestant->unk11_3 = TRUE;
+ SetContestantStatusUnk13(shared192D0.unk11, 1);
+}
+
+void ContestEffect_03(void)
+{
+ curContestant->unk10_3 = TRUE;
+ curContestant->disappointedRepeat = FALSE;
+ curContestant->moveRepeatCount = 0;
+}
+
+void ContestEffect_04(void)
+{
+ curContestant->unk12 = 1;
+ SetContestantStatusUnk13(shared192D0.unk11, 2);
}
+void ContestEffect_05(void)
+{
+ curContestant->unk10_1 = TRUE;
+ SetContestantStatusUnk13(shared192D0.unk11, 3);
+}
+
+void ContestEffect_06(void)
+{
+ curContestant->unkF = 20;
+ SetContestantStatusUnk13(shared192D0.unk11, 4);
+}
+
+void ContestEffect_07(void)
+{
+ curContestant->unk10_0 = TRUE;
+ SetContestantStatusUnk13(shared192D0.unk11, 5);
+}
+
+void ContestEffect_08(void)
+{
+ u8 idx = 0;
+ u8 a = shared192D0.unk11;
+
+ if (shared192D0.unk0[a] != 0) {
+ int i;
+ for (i = 0; i < 4 && shared192D0.unk0[a] - 1 != shared192D0.unk0[i]; i++)
+ ;
+ shared192D0.unk8 = i;
+ shared192D0.unk9 = 0xFF;
+ idx = sub_80B9120();
+ }
+ if (idx == 0)
+ SetContestantStatusUnk14(shared192D0.unk11, 0x36);
+ SetContestantStatusUnk13(shared192D0.unk11, 48);
+}