summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/rom2.s26
-rw-r--r--asm/rom5.s272
-rw-r--r--data/contest_effect_funcs.s51
-rw-r--r--data/data2.s6
4 files changed, 202 insertions, 153 deletions
diff --git a/asm/rom2.s b/asm/rom2.s
index 233e600d3..c05ebd17e 100644
--- a/asm/rom2.s
+++ b/asm/rom2.s
@@ -4,15 +4,15 @@
.text
- thumb_func_start sub_8007080
-sub_8007080: @ 8007080
+ thumb_func_start Task_DestroySelf
+Task_DestroySelf: @ 8007080
push {lr}
lsls r0, 24
lsrs r0, 24
bl DestroyTask
pop {r0}
bx r0
- thumb_func_end sub_8007080
+ thumb_func_end Task_DestroySelf
thumb_func_start sub_8007090
sub_8007090: @ 8007090
@@ -226,10 +226,10 @@ _08007250: .4byte 0x03002b74
_08007254: .4byte 0x00001111
_08007258: .4byte 0x03001770
_0800725C: .4byte 0x02024eae
-_08007260: .4byte sub_8007080
+_08007260: .4byte Task_DestroySelf
_08007264: .4byte 0x03000444
-_08007268: .4byte task00_link_test
-_0800726C: .4byte c2_08009A8C
+_08007268: .4byte Task_LinkTest
+_0800726C: .4byte CB2_80075CC
thumb_func_end sub_80071A4
thumb_func_start sub_8007270
@@ -654,8 +654,8 @@ _080075C4: .4byte 0x03001bf8
_080075C8: .4byte 0x03002fc0
thumb_func_end sub_8007510
- thumb_func_start c2_08009A8C
-c2_08009A8C: @ 80075CC
+ thumb_func_start CB2_80075CC
+CB2_80075CC: @ 80075CC
push {lr}
bl sub_8007510
movs r0, 0x1
@@ -668,7 +668,7 @@ c2_08009A8C: @ 80075CC
bl fade_and_return_progress_probably
pop {r0}
bx r0
- thumb_func_end c2_08009A8C
+ thumb_func_end CB2_80075CC
thumb_func_start sub_80075F0
sub_80075F0: @ 80075F0
@@ -2125,8 +2125,8 @@ _08008050: .4byte 0x00002222
_08008054: .4byte 0x03002fc0
thumb_func_end sub_800802C
- thumb_func_start task00_link_test
-task00_link_test: @ 8008058
+ thumb_func_start Task_LinkTest
+Task_LinkTest: @ 8008058
push {r4-r6,lr}
ldr r0, _08008164
ldrb r0, [r0]
@@ -2249,7 +2249,7 @@ _08008174: .4byte 0x03004030
_08008178: .4byte 0x03002918
_0800817C: .4byte 0x03002964
_08008180: .4byte 0x03003048
- thumb_func_end task00_link_test
+ thumb_func_end Task_LinkTest
thumb_func_start sub_8008184
sub_8008184: @ 8008184
@@ -2886,7 +2886,7 @@ _08008638: .4byte sub_8007300
_0800863C: .4byte gWindowConfig_81E7198
_08008640: .4byte 0x04000052
_08008644: .4byte 0x03001bb4
-_08008648: .4byte sub_8007080
+_08008648: .4byte Task_DestroySelf
_0800864C: .4byte sub_8008650
thumb_func_end sub_80085BC
diff --git a/asm/rom5.s b/asm/rom5.s
index c67cc94f3..74f58fab3 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -110944,7 +110944,7 @@ _080B123C:
.align 2, 0
_080B1264: .4byte 0x02019260
_080B1268: .4byte gContestEffects
-_080B126C: .4byte gUnknown_083D01AC
+_080B126C: .4byte gContestEffectFuncs
_080B1270:
ldrb r1, [r2, 0x11]
movs r0, 0x20
@@ -124982,13 +124982,13 @@ _080B7D82:
bx r1
thumb_func_end AreMovesContestCombo
- thumb_func_start nullsub_63
-nullsub_63: @ 80B7D8C
+ thumb_func_start ContestEffect_00
+ContestEffect_00: @ 80B7D8C
bx lr
- thumb_func_end nullsub_63
+ thumb_func_end ContestEffect_00
- thumb_func_start sub_80B7D90
-sub_80B7D90: @ 80B7D90
+ thumb_func_start ContestEffect_01
+ContestEffect_01: @ 80B7D90
push {lr}
ldr r3, _080B7DB8
ldrb r1, [r3, 0x11]
@@ -125009,10 +125009,10 @@ sub_80B7D90: @ 80B7D90
bx r0
.align 2, 0
_080B7DB8: .4byte 0x020192d0
- thumb_func_end sub_80B7D90
+ thumb_func_end ContestEffect_01
- thumb_func_start sub_80B7DBC
-sub_80B7DBC: @ 80B7DBC
+ thumb_func_start ContestEffect_02
+ContestEffect_02: @ 80B7DBC
push {lr}
ldr r3, _080B7DE4
ldrb r1, [r3, 0x11]
@@ -125033,10 +125033,10 @@ sub_80B7DBC: @ 80B7DBC
bx r0
.align 2, 0
_080B7DE4: .4byte 0x020192d0
- thumb_func_end sub_80B7DBC
+ thumb_func_end ContestEffect_02
- thumb_func_start sub_80B7DE8
-sub_80B7DE8: @ 80B7DE8
+ thumb_func_start ContestEffect_03
+ContestEffect_03: @ 80B7DE8
push {r4,lr}
ldr r3, _080B7E30
ldrb r1, [r3, 0x11]
@@ -125075,10 +125075,10 @@ sub_80B7DE8: @ 80B7DE8
bx r0
.align 2, 0
_080B7E30: .4byte 0x020192d0
- thumb_func_end sub_80B7DE8
+ thumb_func_end ContestEffect_03
- thumb_func_start sub_80B7E34
-sub_80B7E34: @ 80B7E34
+ thumb_func_start ContestEffect_04
+ContestEffect_04: @ 80B7E34
push {lr}
ldr r2, _080B7E58
ldrb r1, [r2, 0x11]
@@ -125097,10 +125097,10 @@ sub_80B7E34: @ 80B7E34
bx r0
.align 2, 0
_080B7E58: .4byte 0x020192d0
- thumb_func_end sub_80B7E34
+ thumb_func_end ContestEffect_04
- thumb_func_start sub_80B7E5C
-sub_80B7E5C: @ 80B7E5C
+ thumb_func_start ContestEffect_05
+ContestEffect_05: @ 80B7E5C
push {lr}
ldr r3, _080B7E84
ldrb r1, [r3, 0x11]
@@ -125121,10 +125121,10 @@ sub_80B7E5C: @ 80B7E5C
bx r0
.align 2, 0
_080B7E84: .4byte 0x020192d0
- thumb_func_end sub_80B7E5C
+ thumb_func_end ContestEffect_05
- thumb_func_start sub_80B7E88
-sub_80B7E88: @ 80B7E88
+ thumb_func_start ContestEffect_06
+ContestEffect_06: @ 80B7E88
push {lr}
ldr r2, _080B7EAC
ldrb r1, [r2, 0x11]
@@ -125143,10 +125143,10 @@ sub_80B7E88: @ 80B7E88
bx r0
.align 2, 0
_080B7EAC: .4byte 0x020192d0
- thumb_func_end sub_80B7E88
+ thumb_func_end ContestEffect_06
- thumb_func_start sub_80B7EB0
-sub_80B7EB0: @ 80B7EB0
+ thumb_func_start ContestEffect_07
+ContestEffect_07: @ 80B7EB0
push {lr}
ldr r3, _080B7ED8
ldrb r1, [r3, 0x11]
@@ -125167,10 +125167,10 @@ sub_80B7EB0: @ 80B7EB0
bx r0
.align 2, 0
_080B7ED8: .4byte 0x020192d0
- thumb_func_end sub_80B7EB0
+ thumb_func_end ContestEffect_07
- thumb_func_start ContestEffectFunc_080E55EC
-ContestEffectFunc_080E55EC: @ 80B7EDC
+ thumb_func_start ContestEffect_08
+ContestEffect_08: @ 80B7EDC
push {r4,lr}
movs r2, 0
ldr r3, _080B7F38
@@ -125220,10 +125220,10 @@ _080B7F28:
bx r0
.align 2, 0
_080B7F38: .4byte 0x020192d0
- thumb_func_end ContestEffectFunc_080E55EC
+ thumb_func_end ContestEffect_08
- thumb_func_start ContestEffectFunc_080E5664
-ContestEffectFunc_080E5664: @ 80B7F3C
+ thumb_func_start ContestEffect_09
+ContestEffect_09: @ 80B7F3C
push {r4-r6,lr}
movs r2, 0
ldr r1, _080B7F9C
@@ -125274,10 +125274,10 @@ _080B7F8A:
bx r0
.align 2, 0
_080B7F9C: .4byte 0x020192d0
- thumb_func_end ContestEffectFunc_080E5664
+ thumb_func_end ContestEffect_09
- thumb_func_start ContestEffectFunc_080E56E0
-ContestEffectFunc_080E56E0: @ 80B7FA0
+ thumb_func_start ContestEffect_14
+ContestEffect_14: @ 80B7FA0
push {lr}
bl Random
lsls r0, 16
@@ -125296,15 +125296,15 @@ ContestEffectFunc_080E56E0: @ 80B7FA0
_080B7FC2:
ldr r0, _080B7FD0
strh r1, [r0, 0x4]
- bl ContestEffectFunc_080E55EC
+ bl ContestEffect_08
pop {r0}
bx r0
.align 2, 0
_080B7FD0: .4byte 0x020192d0
- thumb_func_end ContestEffectFunc_080E56E0
+ thumb_func_end ContestEffect_14
- thumb_func_start ContestEffectFunc_080E5718
-ContestEffectFunc_080E5718: @ 80B7FD4
+ thumb_func_start ContestEffect_15
+ContestEffect_15: @ 80B7FD4
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -125383,10 +125383,10 @@ _080B8062:
bx r0
.align 2, 0
_080B806C: .4byte 0x020192d0
- thumb_func_end ContestEffectFunc_080E5718
+ thumb_func_end ContestEffect_15
- thumb_func_start ContestEffectFunc_080E57CC
-ContestEffectFunc_080E57CC: @ 80B8070
+ thumb_func_start ContestEffect_16
+ContestEffect_16: @ 80B8070
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -125465,10 +125465,10 @@ _080B80FA:
bx r0
.align 2, 0
_080B8108: .4byte 0x020192d0
- thumb_func_end ContestEffectFunc_080E57CC
+ thumb_func_end ContestEffect_16
- thumb_func_start ContestEffectFunc_080E588C
-ContestEffectFunc_080E588C: @ 80B810C
+ thumb_func_start ContestEffect_17
+ContestEffect_17: @ 80B810C
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -125547,10 +125547,10 @@ _080B8192:
bx r0
.align 2, 0
_080B81A0: .4byte 0x020192d0
- thumb_func_end ContestEffectFunc_080E588C
+ thumb_func_end ContestEffect_17
- thumb_func_start ContestEffectFunc_080E5938
-ContestEffectFunc_080E5938: @ 80B81A4
+ thumb_func_start ContestEffect_18
+ContestEffect_18: @ 80B81A4
push {r4,lr}
ldr r4, _080B81D0
ldrb r1, [r4, 0x11]
@@ -125564,7 +125564,7 @@ ContestEffectFunc_080E5938: @ 80B81A4
movs r2, 0x4
orrs r1, r2
strb r1, [r0, 0x11]
- bl ContestEffectFunc_080E5664
+ bl ContestEffect_09
ldrb r0, [r4, 0x11]
movs r1, 0x30
bl sub_80B13EC
@@ -125573,10 +125573,10 @@ ContestEffectFunc_080E5938: @ 80B81A4
bx r0
.align 2, 0
_080B81D0: .4byte 0x020192d0
- thumb_func_end ContestEffectFunc_080E5938
+ thumb_func_end ContestEffect_18
- thumb_func_start sub_80B81D4
-sub_80B81D4: @ 80B81D4
+ thumb_func_start ContestEffect_19
+ContestEffect_19: @ 80B81D4
push {r4,lr}
ldr r4, _080B8208
ldrb r1, [r4, 0x11]
@@ -125603,10 +125603,10 @@ sub_80B81D4: @ 80B81D4
.align 2, 0
_080B8208: .4byte 0x020192d0
_080B820C: .4byte gContestMoves
- thumb_func_end sub_80B81D4
+ thumb_func_end ContestEffect_19
- thumb_func_start sub_80B8210
-sub_80B8210: @ 80B8210
+ thumb_func_start ContestEffect_20
+ContestEffect_20: @ 80B8210
push {lr}
movs r0, 0
bl sub_80B9038
@@ -125618,10 +125618,10 @@ sub_80B8210: @ 80B8210
bx r0
.align 2, 0
_080B8228: .4byte 0x020192d0
- thumb_func_end sub_80B8210
+ thumb_func_end ContestEffect_20
- thumb_func_start sub_80B822C
-sub_80B822C: @ 80B822C
+ thumb_func_start ContestEffect_21
+ContestEffect_21: @ 80B822C
push {lr}
movs r0, 0x1
bl sub_80B9038
@@ -125633,10 +125633,10 @@ sub_80B822C: @ 80B822C
bx r0
.align 2, 0
_080B8244: .4byte 0x020192d0
- thumb_func_end sub_80B822C
+ thumb_func_end ContestEffect_21
- thumb_func_start sub_80B8248
-sub_80B8248: @ 80B8248
+ thumb_func_start ContestEffect_22
+ContestEffect_22: @ 80B8248
push {lr}
movs r0, 0x2
bl sub_80B9038
@@ -125648,10 +125648,10 @@ sub_80B8248: @ 80B8248
bx r0
.align 2, 0
_080B8260: .4byte 0x020192d0
- thumb_func_end sub_80B8248
+ thumb_func_end ContestEffect_22
- thumb_func_start sub_80B8264
-sub_80B8264: @ 80B8264
+ thumb_func_start ContestEffect_23
+ContestEffect_23: @ 80B8264
push {lr}
movs r0, 0x3
bl sub_80B9038
@@ -125663,10 +125663,10 @@ sub_80B8264: @ 80B8264
bx r0
.align 2, 0
_080B827C: .4byte 0x020192d0
- thumb_func_end sub_80B8264
+ thumb_func_end ContestEffect_23
- thumb_func_start sub_80B8280
-sub_80B8280: @ 80B8280
+ thumb_func_start ContestEffect_24
+ContestEffect_24: @ 80B8280
push {lr}
movs r0, 0x4
bl sub_80B9038
@@ -125678,10 +125678,10 @@ sub_80B8280: @ 80B8280
bx r0
.align 2, 0
_080B8298: .4byte 0x020192d0
- thumb_func_end sub_80B8280
+ thumb_func_end ContestEffect_24
- thumb_func_start ContestEffectFunc_080E5A50
-ContestEffectFunc_080E5A50: @ 80B829C
+ thumb_func_start ContestEffect_25
+ContestEffect_25: @ 80B829C
push {r4-r7,lr}
movs r4, 0
ldr r0, _080B82E0
@@ -125739,10 +125739,10 @@ _080B8308:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end ContestEffectFunc_080E5A50
+ thumb_func_end ContestEffect_25
- thumb_func_start ContestEffectFunc_080E5AD4
-ContestEffectFunc_080E5AD4: @ 80B8310
+ thumb_func_start ContestEffect_26
+ContestEffect_26: @ 80B8310
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -125987,10 +125987,10 @@ _080B84E2:
bx r0
.align 2, 0
_080B84F4: .4byte 0x020192d0
- thumb_func_end ContestEffectFunc_080E5AD4
+ thumb_func_end ContestEffect_26
- thumb_func_start ContestEffectFunc_080E5CD4
-ContestEffectFunc_080E5CD4: @ 80B84F8
+ thumb_func_start ContestEffect_27
+ContestEffect_27: @ 80B84F8
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -126060,10 +126060,10 @@ _080B8576:
bx r0
.align 2, 0
_080B8580: .4byte 0x020192d0
- thumb_func_end ContestEffectFunc_080E5CD4
+ thumb_func_end ContestEffect_27
- thumb_func_start sub_80B8584
-sub_80B8584: @ 80B8584
+ thumb_func_start ContestEffect_28
+ContestEffect_28: @ 80B8584
push {r4-r7,lr}
movs r7, 0
movs r5, 0
@@ -126123,10 +126123,10 @@ _080B85EC:
bx r0
.align 2, 0
_080B85F4: .4byte 0x020192d0
- thumb_func_end sub_80B8584
+ thumb_func_end ContestEffect_28
- thumb_func_start sub_80B85F8
-sub_80B85F8: @ 80B85F8
+ thumb_func_start ContestEffect_29
+ContestEffect_29: @ 80B85F8
push {r4,lr}
ldr r0, _080B863C
ldr r4, _080B8640
@@ -126166,10 +126166,10 @@ _080B863C: .4byte 0x02038696
_080B8640: .4byte 0x020192d0
_080B8644: .4byte gContestEffects
_080B8648: .4byte gContestMoves
- thumb_func_end sub_80B85F8
+ thumb_func_end ContestEffect_29
- thumb_func_start sub_80B864C
-sub_80B864C: @ 80B864C
+ thumb_func_start ContestEffect_30
+ContestEffect_30: @ 80B864C
push {r4,lr}
ldr r0, _080B8690
ldr r4, _080B8694
@@ -126209,10 +126209,10 @@ _080B8690: .4byte 0x02038696
_080B8694: .4byte 0x020192d0
_080B8698: .4byte gContestEffects
_080B869C: .4byte gContestMoves
- thumb_func_end sub_80B864C
+ thumb_func_end ContestEffect_30
- thumb_func_start ContestEffectFunc_080E5EB4
-ContestEffectFunc_080E5EB4: @ 80B86A0
+ thumb_func_start ContestEffect_31
+ContestEffect_31: @ 80B86A0
push {r4-r7,lr}
movs r1, 0
movs r3, 0
@@ -126295,10 +126295,10 @@ _080B8710:
bx r0
.align 2, 0
_080B873C: .4byte 0x020192d0
- thumb_func_end ContestEffectFunc_080E5EB4
+ thumb_func_end ContestEffect_31
- thumb_func_start ContestEffectFunc_080E5F64
-ContestEffectFunc_080E5F64: @ 80B8740
+ thumb_func_start ContestEffect_32
+ContestEffect_32: @ 80B8740
push {r4-r7,lr}
movs r6, 0
ldr r0, _080B8794
@@ -126361,10 +126361,10 @@ _080B87B2:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end ContestEffectFunc_080E5F64
+ thumb_func_end ContestEffect_32
- thumb_func_start ContestEffectFunc_080E5FE4
-ContestEffectFunc_080E5FE4: @ 80B87B8
+ thumb_func_start ContestEffect_33
+ContestEffect_33: @ 80B87B8
push {lr}
ldr r0, _080B87D8
ldrb r2, [r0, 0x11]
@@ -126426,10 +126426,10 @@ _080B8820:
_080B882A:
pop {r0}
bx r0
- thumb_func_end ContestEffectFunc_080E5FE4
+ thumb_func_end ContestEffect_33
- thumb_func_start sub_80B8830
-sub_80B8830: @ 80B8830
+ thumb_func_start ContestEffect_34
+ContestEffect_34: @ 80B8830
push {r4,lr}
bl Random
lsls r0, 16
@@ -126502,10 +126502,10 @@ _080B88B0:
bx r0
.align 2, 0
_080B88C8: .4byte 0x020192d0
- thumb_func_end sub_80B8830
+ thumb_func_end ContestEffect_34
- thumb_func_start ContestEffectFunc_080E611C
-ContestEffectFunc_080E611C: @ 80B88CC
+ thumb_func_start ContestEffect_35
+ContestEffect_35: @ 80B88CC
push {r4-r7,lr}
ldr r1, _080B8940
ldrb r0, [r1, 0x11]
@@ -126617,10 +126617,10 @@ _080B8994:
.align 2, 0
_080B899C: .4byte gContestMoves
_080B89A0: .4byte gContestEffects
- thumb_func_end ContestEffectFunc_080E611C
+ thumb_func_end ContestEffect_35
- thumb_func_start ContestEffectFunc_080E620C
-ContestEffectFunc_080E620C: @ 80B89A4
+ thumb_func_start ContestEffect_36
+ContestEffect_36: @ 80B89A4
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -126703,10 +126703,10 @@ _080B8A3C:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end ContestEffectFunc_080E620C
+ thumb_func_end ContestEffect_36
- thumb_func_start ContestEffectFunc_080E62B8
-ContestEffectFunc_080E62B8: @ 80B8A48
+ thumb_func_start ContestEffect_37
+ContestEffect_37: @ 80B8A48
push {r4-r7,lr}
ldr r1, _080B8A94
ldrb r0, [r1, 0x11]
@@ -126764,10 +126764,10 @@ _080B8AB0:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end ContestEffectFunc_080E62B8
+ thumb_func_end ContestEffect_37
- thumb_func_start sub_80B8AB8
-sub_80B8AB8: @ 80B8AB8
+ thumb_func_start ContestEffect_38
+ContestEffect_38: @ 80B8AB8
push {r4,r5,lr}
ldr r4, _080B8AFC
ldrb r2, [r4, 0x11]
@@ -126811,10 +126811,10 @@ _080B8B08:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_80B8AB8
+ thumb_func_end ContestEffect_38
- thumb_func_start sub_80B8B10
-sub_80B8B10: @ 80B8B10
+ thumb_func_start ContestEffect_39
+ContestEffect_39: @ 80B8B10
push {r4,lr}
ldr r3, _080B8B48
ldrb r1, [r3, 0x11]
@@ -126852,10 +126852,10 @@ _080B8B54:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80B8B10
+ thumb_func_end ContestEffect_39
- thumb_func_start sub_80B8B5C
-sub_80B8B5C: @ 80B8B5C
+ thumb_func_start ContestEffect_40
+ContestEffect_40: @ 80B8B5C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -127010,10 +127010,10 @@ _080B8C76:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_80B8B5C
+ thumb_func_end ContestEffect_40
- thumb_func_start sub_80B8C84
-sub_80B8C84: @ 80B8C84
+ thumb_func_start ContestEffect_41
+ContestEffect_41: @ 80B8C84
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -127173,15 +127173,15 @@ _080B8DA6:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_80B8C84
+ thumb_func_end ContestEffect_41
- thumb_func_start nullsub_64
-nullsub_64: @ 80B8DB4
+ thumb_func_start ContestEffect_42
+ContestEffect_42: @ 80B8DB4
bx lr
- thumb_func_end nullsub_64
+ thumb_func_end ContestEffect_42
- thumb_func_start ContestEffectFunc_080E6668
-ContestEffectFunc_080E6668: @ 80B8DB8
+ thumb_func_start ContestEffect_43
+ContestEffect_43: @ 80B8DB8
push {r4-r7,lr}
sub sp, 0x8
ldr r1, _080B8E30
@@ -127315,10 +127315,10 @@ _080B8EAE:
bx r0
.align 2, 0
_080B8EB8: .4byte 0x020192d0
- thumb_func_end ContestEffectFunc_080E6668
+ thumb_func_end ContestEffect_43
- thumb_func_start sub_80B8EBC
-sub_80B8EBC: @ 80B8EBC
+ thumb_func_start ContestEffect_44
+ContestEffect_44: @ 80B8EBC
push {lr}
ldr r3, _080B8EF0
ldr r1, _080B8EF4
@@ -127349,10 +127349,10 @@ _080B8EEA:
_080B8EF0: .4byte gContestMoves
_080B8EF4: .4byte 0x020192d0
_080B8EF8: .4byte 0x0203869c
- thumb_func_end sub_80B8EBC
+ thumb_func_end ContestEffect_44
- thumb_func_start ContestEffectFunc_080E67BC
-ContestEffectFunc_080E67BC: @ 80B8EFC
+ thumb_func_start ContestEffect_45
+ContestEffect_45: @ 80B8EFC
push {r4-r7,lr}
movs r7, 0
movs r5, 0
@@ -127418,10 +127418,10 @@ _080B8F68:
bx r0
.align 2, 0
_080B8F78: .4byte 0x020192d0
- thumb_func_end ContestEffectFunc_080E67BC
+ thumb_func_end ContestEffect_45
- thumb_func_start sub_80B8F7C
-sub_80B8F7C: @ 80B8F7C
+ thumb_func_start ContestEffect_46
+ContestEffect_46: @ 80B8F7C
push {r4,lr}
ldr r0, _080B8F98
movs r1, 0x13
@@ -127483,10 +127483,10 @@ _080B8FDE:
bx r0
.align 2, 0
_080B8FF4: .4byte 0x020192d0
- thumb_func_end sub_80B8F7C
+ thumb_func_end ContestEffect_46
- thumb_func_start sub_80B8FF8
-sub_80B8FF8: @ 80B8FF8
+ thumb_func_start ContestEffect_47
+ContestEffect_47: @ 80B8FF8
push {lr}
ldr r3, _080B9034
ldrb r2, [r3, 0x1]
@@ -127518,7 +127518,7 @@ _080B902E:
bx r0
.align 2, 0
_080B9034: .4byte 0x02019328
- thumb_func_end sub_80B8FF8
+ thumb_func_end ContestEffect_47
thumb_func_start sub_80B9038
sub_80B9038: @ 80B9038
@@ -418052,7 +418052,7 @@ sub_8146930: @ 8146930
.align 2, 0
_0814699C: .4byte sub_8146900
_081469A0: .4byte gWindowConfig_81E6CE4
-_081469A4: .4byte sub_8007080
+_081469A4: .4byte Task_DestroySelf
_081469A8: .4byte sub_81469E4
thumb_func_end sub_8146930
diff --git a/data/contest_effect_funcs.s b/data/contest_effect_funcs.s
new file mode 100644
index 000000000..b3fdeb539
--- /dev/null
+++ b/data/contest_effect_funcs.s
@@ -0,0 +1,51 @@
+ .align 2
+ .global gContestEffectFuncs
+gContestEffectFuncs:
+ .4byte ContestEffect_00
+ .4byte ContestEffect_01
+ .4byte ContestEffect_02
+ .4byte ContestEffect_03
+ .4byte ContestEffect_04
+ .4byte ContestEffect_05
+ .4byte ContestEffect_06
+ .4byte ContestEffect_07
+ .4byte ContestEffect_08
+ .4byte ContestEffect_09
+ .4byte ContestEffect_08
+ .4byte ContestEffect_09
+ .4byte ContestEffect_08
+ .4byte ContestEffect_09
+ .4byte ContestEffect_14
+ .4byte ContestEffect_15
+ .4byte ContestEffect_16
+ .4byte ContestEffect_17
+ .4byte ContestEffect_18
+ .4byte ContestEffect_19
+ .4byte ContestEffect_20
+ .4byte ContestEffect_21
+ .4byte ContestEffect_22
+ .4byte ContestEffect_23
+ .4byte ContestEffect_24
+ .4byte ContestEffect_25
+ .4byte ContestEffect_26
+ .4byte ContestEffect_27
+ .4byte ContestEffect_28
+ .4byte ContestEffect_29
+ .4byte ContestEffect_30
+ .4byte ContestEffect_31
+ .4byte ContestEffect_32
+ .4byte ContestEffect_33
+ .4byte ContestEffect_34
+ .4byte ContestEffect_35
+ .4byte ContestEffect_36
+ .4byte ContestEffect_37
+ .4byte ContestEffect_38
+ .4byte ContestEffect_39
+ .4byte ContestEffect_40
+ .4byte ContestEffect_41
+ .4byte ContestEffect_42
+ .4byte ContestEffect_43
+ .4byte ContestEffect_44
+ .4byte ContestEffect_45
+ .4byte ContestEffect_46
+ .4byte ContestEffect_47
diff --git a/data/data2.s b/data/data2.s
index b62b047b2..7d8fd002c 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -4379,10 +4379,8 @@ gComboStarterLookupTable: @ 83D016C
.byte TRUE
.endr
- .align 2
- .global gUnknown_083D01AC
-gUnknown_083D01AC: @ 83D01AC
- .incbin "baserom.gba", 0x003d01ac, 0xc0
+@ 83D01AC
+ .include "data/contest_effect_funcs.s"
.global gUnknown_083D026C
gUnknown_083D026C: @ 83D026C
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-11 20:31:43 +0000