mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-11-16 19:47:35 +01:00
contest move effect func ptr table
This commit is contained in:
YamaArashi
parent
078afb798e
commit
27061f496e
289
asm/emerald.s
289
asm/emerald.s
@ -410225,7 +410225,7 @@ sub_80D8490: ; 80D8490
|
||||
adds r0, r2
|
||||
ldrh r0, [r0, 0x8]
|
||||
adds r1, r4, 0
|
||||
bl sub_80E5414
|
||||
bl AreMovesContestCombo
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq @080D853C
|
||||
@ -419681,7 +419681,7 @@ sub_80DD080: ; 80DD080
|
||||
beq @080DD1B4
|
||||
ldrh r0, [r2, 0x8]
|
||||
ldrh r1, [r2, 0x6]
|
||||
bl sub_80E5414
|
||||
bl AreMovesContestCombo
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne @080DD1B4
|
||||
@ -419694,7 +419694,7 @@ sub_80DD080: ; 80DD080
|
||||
ands r0, r2
|
||||
strb r0, [r1, 0x15]
|
||||
@080DD1B4:
|
||||
ldr r0, =gUnknown_0858CECC
|
||||
ldr r0, =gContestEffectFunctionTable
|
||||
add r0, r9
|
||||
ldr r0, [r0]
|
||||
bl _call_via_r0
|
||||
@ -419761,7 +419761,7 @@ sub_80DD080: ; 80DD080
|
||||
adds r1, r4, r1
|
||||
ldrh r0, [r1, 0x8]
|
||||
ldrh r1, [r1, 0x6]
|
||||
bl sub_80E5414
|
||||
bl AreMovesContestCombo
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
cmp r3, 0
|
||||
@ -435900,8 +435900,9 @@ sub_80E53F4: ; 80E53F4
|
||||
.pool
|
||||
thumb_func_end sub_80E53F4
|
||||
|
||||
thumb_func_start sub_80E5414
|
||||
sub_80E5414: ; 80E5414
|
||||
thumb_func_start AreMovesContestCombo
|
||||
; u8 AreMovesContestCombo(u16 moveId1, u16 moveId2)
|
||||
AreMovesContestCombo: ; 80E5414
|
||||
push {r4,lr}
|
||||
sub sp, 0x4
|
||||
lsls r0, 16
|
||||
@ -435953,15 +435954,15 @@ sub_80E5414: ; 80E5414
|
||||
pop {r4}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_80E5414
|
||||
thumb_func_end AreMovesContestCombo
|
||||
|
||||
thumb_func_start nullsub_99
|
||||
nullsub_99: ; 80E547C
|
||||
thumb_func_start ContestEffectFunc_080E547C
|
||||
ContestEffectFunc_080E547C: ; 80E547C
|
||||
bx lr
|
||||
thumb_func_end nullsub_99
|
||||
thumb_func_end ContestEffectFunc_080E547C
|
||||
|
||||
thumb_func_start sub_80E5480
|
||||
sub_80E5480: ; 80E5480
|
||||
thumb_func_start ContestEffectFunc_080E5480
|
||||
ContestEffectFunc_080E5480: ; 80E5480
|
||||
push {lr}
|
||||
ldr r3, =0x02039f34
|
||||
ldr r1, [r3]
|
||||
@ -435985,10 +435986,10 @@ sub_80E5480: ; 80E5480
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E5480
|
||||
thumb_func_end ContestEffectFunc_080E5480
|
||||
|
||||
thumb_func_start sub_80E54B0
|
||||
sub_80E54B0: ; 80E54B0
|
||||
thumb_func_start ContestEffectFunc_080E54B0
|
||||
ContestEffectFunc_080E54B0: ; 80E54B0
|
||||
push {lr}
|
||||
ldr r3, =0x02039f34
|
||||
ldr r1, [r3]
|
||||
@ -436012,10 +436013,10 @@ sub_80E54B0: ; 80E54B0
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E54B0
|
||||
thumb_func_end ContestEffectFunc_080E54B0
|
||||
|
||||
thumb_func_start sub_80E54E0
|
||||
sub_80E54E0: ; 80E54E0
|
||||
thumb_func_start ContestEffectFunc_080E54E0
|
||||
ContestEffectFunc_080E54E0: ; 80E54E0
|
||||
ldr r3, =0x02039f34
|
||||
ldr r1, [r3]
|
||||
ldr r0, [r1, 0x8]
|
||||
@ -436058,10 +436059,10 @@ sub_80E54E0: ; 80E54E0
|
||||
bx lr
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E54E0
|
||||
thumb_func_end ContestEffectFunc_080E54E0
|
||||
|
||||
thumb_func_start sub_80E5534
|
||||
sub_80E5534: ; 80E5534
|
||||
thumb_func_start ContestEffectFunc_080E5534
|
||||
ContestEffectFunc_080E5534: ; 80E5534
|
||||
push {lr}
|
||||
ldr r3, =0x02039f34
|
||||
ldr r1, [r3]
|
||||
@ -436083,10 +436084,10 @@ sub_80E5534: ; 80E5534
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E5534
|
||||
thumb_func_end ContestEffectFunc_080E5534
|
||||
|
||||
thumb_func_start sub_80E5560
|
||||
sub_80E5560: ; 80E5560
|
||||
thumb_func_start ContestEffectFunc_080E5560
|
||||
ContestEffectFunc_080E5560: ; 80E5560
|
||||
push {lr}
|
||||
ldr r3, =0x02039f34
|
||||
ldr r1, [r3]
|
||||
@ -436110,10 +436111,10 @@ sub_80E5560: ; 80E5560
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E5560
|
||||
thumb_func_end ContestEffectFunc_080E5560
|
||||
|
||||
thumb_func_start sub_80E5590
|
||||
sub_80E5590: ; 80E5590
|
||||
thumb_func_start ContestEffectFunc_080E5590
|
||||
ContestEffectFunc_080E5590: ; 80E5590
|
||||
push {lr}
|
||||
ldr r3, =0x02039f34
|
||||
ldr r1, [r3]
|
||||
@ -436135,10 +436136,10 @@ sub_80E5590: ; 80E5590
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E5590
|
||||
thumb_func_end ContestEffectFunc_080E5590
|
||||
|
||||
thumb_func_start sub_80E55BC
|
||||
sub_80E55BC: ; 80E55BC
|
||||
thumb_func_start ContestEffectFunc_080E55BC
|
||||
ContestEffectFunc_080E55BC: ; 80E55BC
|
||||
push {lr}
|
||||
ldr r3, =0x02039f34
|
||||
ldr r1, [r3]
|
||||
@ -436162,10 +436163,10 @@ sub_80E55BC: ; 80E55BC
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E55BC
|
||||
thumb_func_end ContestEffectFunc_080E55BC
|
||||
|
||||
thumb_func_start sub_80E55EC
|
||||
sub_80E55EC: ; 80E55EC
|
||||
thumb_func_start ContestEffectFunc_080E55EC
|
||||
ContestEffectFunc_080E55EC: ; 80E55EC
|
||||
push {r4,r5,lr}
|
||||
movs r2, 0
|
||||
ldr r5, =0x02039f34
|
||||
@ -436227,10 +436228,10 @@ sub_80E55EC: ; 80E55EC
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E55EC
|
||||
thumb_func_end ContestEffectFunc_080E55EC
|
||||
|
||||
thumb_func_start c3_080493E4
|
||||
c3_080493E4: ; 80E5664
|
||||
thumb_func_start ContestEffectFunc_080E5664
|
||||
ContestEffectFunc_080E5664: ; 80E5664
|
||||
push {r4-r6,lr}
|
||||
movs r1, 0
|
||||
ldr r2, =0x02039f34
|
||||
@ -436293,10 +436294,10 @@ c3_080493E4: ; 80E5664
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end c3_080493E4
|
||||
thumb_func_end ContestEffectFunc_080E5664
|
||||
|
||||
thumb_func_start sub_80E56E0
|
||||
sub_80E56E0: ; 80E56E0
|
||||
thumb_func_start ContestEffectFunc_080E56E0
|
||||
ContestEffectFunc_080E56E0: ; 80E56E0
|
||||
push {lr}
|
||||
bl GenerateRandomNumber
|
||||
lsls r0, 16
|
||||
@ -436317,15 +436318,15 @@ sub_80E56E0: ; 80E56E0
|
||||
ldr r0, [r0]
|
||||
ldr r0, [r0, 0x8]
|
||||
strh r1, [r0, 0x4]
|
||||
bl sub_80E55EC
|
||||
bl ContestEffectFunc_080E55EC
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E56E0
|
||||
thumb_func_end ContestEffectFunc_080E56E0
|
||||
|
||||
thumb_func_start sub_80E5718
|
||||
sub_80E5718: ; 80E5718
|
||||
thumb_func_start ContestEffectFunc_080E5718
|
||||
ContestEffectFunc_080E5718: ; 80E5718
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@ -436416,10 +436417,10 @@ sub_80E5718: ; 80E5718
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E5718
|
||||
thumb_func_end ContestEffectFunc_080E5718
|
||||
|
||||
thumb_func_start sub_80E57CC
|
||||
sub_80E57CC: ; 80E57CC
|
||||
thumb_func_start ContestEffectFunc_080E57CC
|
||||
ContestEffectFunc_080E57CC: ; 80E57CC
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@ -436516,10 +436517,10 @@ sub_80E57CC: ; 80E57CC
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E57CC
|
||||
thumb_func_end ContestEffectFunc_080E57CC
|
||||
|
||||
thumb_func_start sub_80E588C
|
||||
sub_80E588C: ; 80E588C
|
||||
thumb_func_start ContestEffectFunc_080E588C
|
||||
ContestEffectFunc_080E588C: ; 80E588C
|
||||
push {r4-r7,lr}
|
||||
mov r7, r9
|
||||
mov r6, r8
|
||||
@ -436608,10 +436609,10 @@ sub_80E588C: ; 80E588C
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E588C
|
||||
thumb_func_end ContestEffectFunc_080E588C
|
||||
|
||||
thumb_func_start sub_80E5938
|
||||
sub_80E5938: ; 80E5938
|
||||
thumb_func_start ContestEffectFunc_080E5938
|
||||
ContestEffectFunc_080E5938: ; 80E5938
|
||||
push {r4,lr}
|
||||
ldr r4, =0x02039f34
|
||||
ldr r1, [r4]
|
||||
@ -436626,7 +436627,7 @@ sub_80E5938: ; 80E5938
|
||||
movs r2, 0x4
|
||||
orrs r1, r2
|
||||
strb r1, [r0, 0x11]
|
||||
bl c3_080493E4
|
||||
bl ContestEffectFunc_080E5664
|
||||
ldr r0, [r4]
|
||||
ldr r0, [r0, 0x8]
|
||||
ldrb r0, [r0, 0x11]
|
||||
@ -436637,10 +436638,10 @@ sub_80E5938: ; 80E5938
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E5938
|
||||
thumb_func_end ContestEffectFunc_080E5938
|
||||
|
||||
thumb_func_start sub_80E5970
|
||||
sub_80E5970: ; 80E5970
|
||||
thumb_func_start ContestEffectFunc_080E5970
|
||||
ContestEffectFunc_080E5970: ; 80E5970
|
||||
push {r4,lr}
|
||||
ldr r4, =0x02039f34
|
||||
ldr r1, [r4]
|
||||
@ -436669,10 +436670,10 @@ sub_80E5970: ; 80E5970
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E5970
|
||||
thumb_func_end ContestEffectFunc_080E5970
|
||||
|
||||
thumb_func_start sub_80E59B0
|
||||
sub_80E59B0: ; 80E59B0
|
||||
thumb_func_start ContestEffectFunc_080E59B0
|
||||
ContestEffectFunc_080E59B0: ; 80E59B0
|
||||
push {lr}
|
||||
movs r0, 0
|
||||
bl sub_80E6934
|
||||
@ -436686,10 +436687,10 @@ sub_80E59B0: ; 80E59B0
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E59B0
|
||||
thumb_func_end ContestEffectFunc_080E59B0
|
||||
|
||||
thumb_func_start sub_80E59D0
|
||||
sub_80E59D0: ; 80E59D0
|
||||
thumb_func_start ContestEffectFunc_080E59D0
|
||||
ContestEffectFunc_080E59D0: ; 80E59D0
|
||||
push {lr}
|
||||
movs r0, 0x1
|
||||
bl sub_80E6934
|
||||
@ -436703,10 +436704,10 @@ sub_80E59D0: ; 80E59D0
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E59D0
|
||||
thumb_func_end ContestEffectFunc_080E59D0
|
||||
|
||||
thumb_func_start sub_80E59F0
|
||||
sub_80E59F0: ; 80E59F0
|
||||
thumb_func_start ContestEffectFunc_080E59F0
|
||||
ContestEffectFunc_080E59F0: ; 80E59F0
|
||||
push {lr}
|
||||
movs r0, 0x2
|
||||
bl sub_80E6934
|
||||
@ -436720,10 +436721,10 @@ sub_80E59F0: ; 80E59F0
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E59F0
|
||||
thumb_func_end ContestEffectFunc_080E59F0
|
||||
|
||||
thumb_func_start sub_80E5A10
|
||||
sub_80E5A10: ; 80E5A10
|
||||
thumb_func_start ContestEffectFunc_080E5A10
|
||||
ContestEffectFunc_080E5A10: ; 80E5A10
|
||||
push {lr}
|
||||
movs r0, 0x3
|
||||
bl sub_80E6934
|
||||
@ -436737,10 +436738,10 @@ sub_80E5A10: ; 80E5A10
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E5A10
|
||||
thumb_func_end ContestEffectFunc_080E5A10
|
||||
|
||||
thumb_func_start sub_80E5A30
|
||||
sub_80E5A30: ; 80E5A30
|
||||
thumb_func_start ContestEffectFunc_080E5A30
|
||||
ContestEffectFunc_080E5A30: ; 80E5A30
|
||||
push {lr}
|
||||
movs r0, 0x4
|
||||
bl sub_80E6934
|
||||
@ -436754,10 +436755,10 @@ sub_80E5A30: ; 80E5A30
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E5A30
|
||||
thumb_func_end ContestEffectFunc_080E5A30
|
||||
|
||||
thumb_func_start sub_80E5A50
|
||||
sub_80E5A50: ; 80E5A50
|
||||
thumb_func_start ContestEffectFunc_080E5A50
|
||||
ContestEffectFunc_080E5A50: ; 80E5A50
|
||||
push {r4-r6,lr}
|
||||
movs r4, 0
|
||||
ldr r2, =0x02039f34
|
||||
@ -436823,10 +436824,10 @@ sub_80E5A50: ; 80E5A50
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80E5A50
|
||||
thumb_func_end ContestEffectFunc_080E5A50
|
||||
|
||||
thumb_func_start sub_80E5AD4
|
||||
sub_80E5AD4: ; 80E5AD4
|
||||
thumb_func_start ContestEffectFunc_080E5AD4
|
||||
ContestEffectFunc_080E5AD4: ; 80E5AD4
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@ -437083,10 +437084,10 @@ sub_80E5AD4: ; 80E5AD4
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E5AD4
|
||||
thumb_func_end ContestEffectFunc_080E5AD4
|
||||
|
||||
thumb_func_start sub_80E5CD4
|
||||
sub_80E5CD4: ; 80E5CD4
|
||||
thumb_func_start ContestEffectFunc_080E5CD4
|
||||
ContestEffectFunc_080E5CD4: ; 80E5CD4
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@ -437170,10 +437171,10 @@ sub_80E5CD4: ; 80E5CD4
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E5CD4
|
||||
thumb_func_end ContestEffectFunc_080E5CD4
|
||||
|
||||
thumb_func_start sub_80E5D7C
|
||||
sub_80E5D7C: ; 80E5D7C
|
||||
thumb_func_start ContestEffectFunc_080E5D7C
|
||||
ContestEffectFunc_080E5D7C: ; 80E5D7C
|
||||
push {r4-r7,lr}
|
||||
movs r7, 0
|
||||
movs r4, 0
|
||||
@ -437242,10 +437243,10 @@ sub_80E5D7C: ; 80E5D7C
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E5D7C
|
||||
thumb_func_end ContestEffectFunc_080E5D7C
|
||||
|
||||
thumb_func_start sub_80E5E04
|
||||
sub_80E5E04: ; 80E5E04
|
||||
thumb_func_start ContestEffectFunc_080E5E04
|
||||
ContestEffectFunc_080E5E04: ; 80E5E04
|
||||
push {r4,lr}
|
||||
ldr r1, =0x02039f26
|
||||
ldr r0, =0x02039f34
|
||||
@ -437284,10 +437285,10 @@ sub_80E5E04: ; 80E5E04
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E5E04
|
||||
thumb_func_end ContestEffectFunc_080E5E04
|
||||
|
||||
thumb_func_start sub_80E5E5C
|
||||
sub_80E5E5C: ; 80E5E5C
|
||||
thumb_func_start ContestEffectFunc_080E5E5C
|
||||
ContestEffectFunc_080E5E5C: ; 80E5E5C
|
||||
push {r4,lr}
|
||||
ldr r1, =0x02039f26
|
||||
ldr r0, =0x02039f34
|
||||
@ -437326,10 +437327,10 @@ sub_80E5E5C: ; 80E5E5C
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E5E5C
|
||||
thumb_func_end ContestEffectFunc_080E5E5C
|
||||
|
||||
thumb_func_start sub_80E5EB4
|
||||
sub_80E5EB4: ; 80E5EB4
|
||||
thumb_func_start ContestEffectFunc_080E5EB4
|
||||
ContestEffectFunc_080E5EB4: ; 80E5EB4
|
||||
push {r4-r7,lr}
|
||||
movs r1, 0
|
||||
movs r5, 0
|
||||
@ -437419,10 +437420,10 @@ sub_80E5EB4: ; 80E5EB4
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E5EB4
|
||||
thumb_func_end ContestEffectFunc_080E5EB4
|
||||
|
||||
thumb_func_start sub_80E5F64
|
||||
sub_80E5F64: ; 80E5F64
|
||||
thumb_func_start ContestEffectFunc_080E5F64
|
||||
ContestEffectFunc_080E5F64: ; 80E5F64
|
||||
push {r4-r7,lr}
|
||||
movs r6, 0
|
||||
ldr r0, =0x02039f34
|
||||
@ -437490,10 +437491,10 @@ sub_80E5F64: ; 80E5F64
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80E5F64
|
||||
thumb_func_end ContestEffectFunc_080E5F64
|
||||
|
||||
thumb_func_start sub_80E5FE4
|
||||
sub_80E5FE4: ; 80E5FE4
|
||||
thumb_func_start ContestEffectFunc_080E5FE4
|
||||
ContestEffectFunc_080E5FE4: ; 80E5FE4
|
||||
push {r4,r5,lr}
|
||||
ldr r1, =0x02039f34
|
||||
ldr r3, [r1]
|
||||
@ -437560,10 +437561,10 @@ sub_80E5FE4: ; 80E5FE4
|
||||
pop {r4,r5}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80E5FE4
|
||||
thumb_func_end ContestEffectFunc_080E5FE4
|
||||
|
||||
thumb_func_start sub_80E6068
|
||||
sub_80E6068: ; 80E6068
|
||||
thumb_func_start ContestEffectFunc_080E6068
|
||||
ContestEffectFunc_080E6068: ; 80E6068
|
||||
push {r4,lr}
|
||||
bl GenerateRandomNumber
|
||||
lsls r0, 16
|
||||
@ -437648,10 +437649,10 @@ sub_80E6068: ; 80E6068
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E6068
|
||||
thumb_func_end ContestEffectFunc_080E6068
|
||||
|
||||
thumb_func_start sub_80E611C
|
||||
sub_80E611C: ; 80E611C
|
||||
thumb_func_start ContestEffectFunc_080E611C
|
||||
ContestEffectFunc_080E611C: ; 80E611C
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@ -437773,10 +437774,10 @@ sub_80E611C: ; 80E611C
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E611C
|
||||
thumb_func_end ContestEffectFunc_080E611C
|
||||
|
||||
thumb_func_start sub_80E620C
|
||||
sub_80E620C: ; 80E620C
|
||||
thumb_func_start ContestEffectFunc_080E620C
|
||||
ContestEffectFunc_080E620C: ; 80E620C
|
||||
push {r4-r7,lr}
|
||||
mov r7, r9
|
||||
mov r6, r8
|
||||
@ -437860,10 +437861,10 @@ sub_80E620C: ; 80E620C
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80E620C
|
||||
thumb_func_end ContestEffectFunc_080E620C
|
||||
|
||||
thumb_func_start sub_80E62B8
|
||||
sub_80E62B8: ; 80E62B8
|
||||
thumb_func_start ContestEffectFunc_080E62B8
|
||||
ContestEffectFunc_080E62B8: ; 80E62B8
|
||||
push {r4-r7,lr}
|
||||
ldr r0, =0x02039f34
|
||||
ldr r0, [r0]
|
||||
@ -437927,10 +437928,10 @@ sub_80E62B8: ; 80E62B8
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80E62B8
|
||||
thumb_func_end ContestEffectFunc_080E62B8
|
||||
|
||||
thumb_func_start sub_80E6334
|
||||
sub_80E6334: ; 80E6334
|
||||
thumb_func_start ContestEffectFunc_080E6334
|
||||
ContestEffectFunc_080E6334: ; 80E6334
|
||||
push {r4,lr}
|
||||
ldr r4, =0x02039f34
|
||||
ldr r1, [r4]
|
||||
@ -437980,10 +437981,10 @@ sub_80E6334: ; 80E6334
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80E6334
|
||||
thumb_func_end ContestEffectFunc_080E6334
|
||||
|
||||
thumb_func_start sub_80E6398
|
||||
sub_80E6398: ; 80E6398
|
||||
thumb_func_start ContestEffectFunc_080E6398
|
||||
ContestEffectFunc_080E6398: ; 80E6398
|
||||
push {lr}
|
||||
ldr r3, =0x02039f34
|
||||
ldr r1, [r3]
|
||||
@ -438024,10 +438025,10 @@ sub_80E6398: ; 80E6398
|
||||
@080E63E4:
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80E6398
|
||||
thumb_func_end ContestEffectFunc_080E6398
|
||||
|
||||
thumb_func_start sub_80E63E8
|
||||
sub_80E63E8: ; 80E63E8
|
||||
thumb_func_start ContestEffectFunc_080E63E8
|
||||
ContestEffectFunc_080E63E8: ; 80E63E8
|
||||
push {r4-r7,lr}
|
||||
sub sp, 0x4
|
||||
ldr r0, =0x02039f34
|
||||
@ -438191,10 +438192,10 @@ sub_80E63E8: ; 80E63E8
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80E63E8
|
||||
thumb_func_end ContestEffectFunc_080E63E8
|
||||
|
||||
thumb_func_start sub_80E6520
|
||||
sub_80E6520: ; 80E6520
|
||||
thumb_func_start ContestEffectFunc_080E6520
|
||||
ContestEffectFunc_080E6520: ; 80E6520
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@ -438365,15 +438366,15 @@ sub_80E6520: ; 80E6520
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80E6520
|
||||
thumb_func_end ContestEffectFunc_080E6520
|
||||
|
||||
thumb_func_start nullsub_100
|
||||
nullsub_100: ; 80E6664
|
||||
thumb_func_start ContestEffectFunc_080E6664
|
||||
ContestEffectFunc_080E6664: ; 80E6664
|
||||
bx lr
|
||||
thumb_func_end nullsub_100
|
||||
thumb_func_end ContestEffectFunc_080E6664
|
||||
|
||||
thumb_func_start sub_80E6668
|
||||
sub_80E6668: ; 80E6668
|
||||
thumb_func_start ContestEffectFunc_080E6668
|
||||
ContestEffectFunc_080E6668: ; 80E6668
|
||||
push {r4-r7,lr}
|
||||
sub sp, 0x8
|
||||
ldr r0, =0x02039f34
|
||||
@ -438514,10 +438515,10 @@ sub_80E6668: ; 80E6668
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E6668
|
||||
thumb_func_end ContestEffectFunc_080E6668
|
||||
|
||||
thumb_func_start sub_80E6778
|
||||
sub_80E6778: ; 80E6778
|
||||
thumb_func_start ContestEffectFunc_080E6778
|
||||
ContestEffectFunc_080E6778: ; 80E6778
|
||||
push {lr}
|
||||
ldr r3, =gContestMoves
|
||||
ldr r0, =0x02039f34
|
||||
@ -438548,10 +438549,10 @@ sub_80E6778: ; 80E6778
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E6778
|
||||
thumb_func_end ContestEffectFunc_080E6778
|
||||
|
||||
thumb_func_start sub_80E67BC
|
||||
sub_80E67BC: ; 80E67BC
|
||||
thumb_func_start ContestEffectFunc_080E67BC
|
||||
ContestEffectFunc_080E67BC: ; 80E67BC
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@ -438638,10 +438639,10 @@ sub_80E67BC: ; 80E67BC
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E67BC
|
||||
thumb_func_end ContestEffectFunc_080E67BC
|
||||
|
||||
thumb_func_start sub_80E6868
|
||||
sub_80E6868: ; 80E6868
|
||||
thumb_func_start ContestEffectFunc_080E6868
|
||||
ContestEffectFunc_080E6868: ; 80E6868
|
||||
push {r4,lr}
|
||||
ldr r0, =0x02039f34
|
||||
ldr r1, [r0]
|
||||
@ -438708,10 +438709,10 @@ sub_80E6868: ; 80E6868
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E6868
|
||||
thumb_func_end ContestEffectFunc_080E6868
|
||||
|
||||
thumb_func_start sub_80E68EC
|
||||
sub_80E68EC: ; 80E68EC
|
||||
thumb_func_start ContestEffectFunc_080E68EC
|
||||
ContestEffectFunc_080E68EC: ; 80E68EC
|
||||
push {r4,lr}
|
||||
ldr r4, =0x02039f34
|
||||
ldr r0, [r4]
|
||||
@ -438748,7 +438749,7 @@ sub_80E68EC: ; 80E68EC
|
||||
bx r0
|
||||
.align 2, 0
|
||||
.pool
|
||||
thumb_func_end sub_80E68EC
|
||||
thumb_func_end ContestEffectFunc_080E68EC
|
||||
|
||||
thumb_func_start sub_80E6934
|
||||
sub_80E6934: ; 80E6934
|
||||
@ -662027,7 +662028,7 @@ sub_8157688: ; 8157688
|
||||
beq @081576D2
|
||||
adds r1, r0, 0
|
||||
adds r0, r5, 0
|
||||
bl sub_80E5414
|
||||
bl AreMovesContestCombo
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
cmp r3, 0
|
||||
@ -662167,7 +662168,7 @@ sub_8157790: ; 8157790
|
||||
cmp r0, 0
|
||||
beq @081577D8
|
||||
adds r1, r5, 0
|
||||
bl sub_80E5414
|
||||
bl AreMovesContestCombo
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
cmp r3, 0
|
||||
@ -662300,7 +662301,7 @@ sub_8157898: ; 8157898
|
||||
cmp r0, 0
|
||||
beq @081578D0
|
||||
adds r1, r3, 0
|
||||
bl sub_80E5414
|
||||
bl AreMovesContestCombo
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
@081578D0:
|
||||
|
||||
51
data/contest_effect_function_table.s
Normal file
51
data/contest_effect_function_table.s
Normal file
@ -0,0 +1,51 @@
|
||||
.align 2, 0
|
||||
|
||||
gContestEffectFunctionTable: ; 858CECC
|
||||
.4byte ContestEffectFunc_080E547C + 1
|
||||
.4byte ContestEffectFunc_080E5480 + 1
|
||||
.4byte ContestEffectFunc_080E54B0 + 1
|
||||
.4byte ContestEffectFunc_080E54E0 + 1
|
||||
.4byte ContestEffectFunc_080E5534 + 1
|
||||
.4byte ContestEffectFunc_080E5560 + 1
|
||||
.4byte ContestEffectFunc_080E5590 + 1
|
||||
.4byte ContestEffectFunc_080E55BC + 1
|
||||
.4byte ContestEffectFunc_080E55EC + 1
|
||||
.4byte ContestEffectFunc_080E5664 + 1
|
||||
.4byte ContestEffectFunc_080E55EC + 1
|
||||
.4byte ContestEffectFunc_080E5664 + 1
|
||||
.4byte ContestEffectFunc_080E55EC + 1
|
||||
.4byte ContestEffectFunc_080E5664 + 1
|
||||
.4byte ContestEffectFunc_080E56E0 + 1
|
||||
.4byte ContestEffectFunc_080E5718 + 1
|
||||
.4byte ContestEffectFunc_080E57CC + 1
|
||||
.4byte ContestEffectFunc_080E588C + 1
|
||||
.4byte ContestEffectFunc_080E5938 + 1
|
||||
.4byte ContestEffectFunc_080E5970 + 1
|
||||
.4byte ContestEffectFunc_080E59B0 + 1
|
||||
.4byte ContestEffectFunc_080E59D0 + 1
|
||||
.4byte ContestEffectFunc_080E59F0 + 1
|
||||
.4byte ContestEffectFunc_080E5A10 + 1
|
||||
.4byte ContestEffectFunc_080E5A30 + 1
|
||||
.4byte ContestEffectFunc_080E5A50 + 1
|
||||
.4byte ContestEffectFunc_080E5AD4 + 1
|
||||
.4byte ContestEffectFunc_080E5CD4 + 1
|
||||
.4byte ContestEffectFunc_080E5D7C + 1
|
||||
.4byte ContestEffectFunc_080E5E04 + 1
|
||||
.4byte ContestEffectFunc_080E5E5C + 1
|
||||
.4byte ContestEffectFunc_080E5EB4 + 1
|
||||
.4byte ContestEffectFunc_080E5F64 + 1
|
||||
.4byte ContestEffectFunc_080E5FE4 + 1
|
||||
.4byte ContestEffectFunc_080E6068 + 1
|
||||
.4byte ContestEffectFunc_080E611C + 1
|
||||
.4byte ContestEffectFunc_080E620C + 1
|
||||
.4byte ContestEffectFunc_080E62B8 + 1
|
||||
.4byte ContestEffectFunc_080E6334 + 1
|
||||
.4byte ContestEffectFunc_080E6398 + 1
|
||||
.4byte ContestEffectFunc_080E63E8 + 1
|
||||
.4byte ContestEffectFunc_080E6520 + 1
|
||||
.4byte ContestEffectFunc_080E6664 + 1
|
||||
.4byte ContestEffectFunc_080E6668 + 1
|
||||
.4byte ContestEffectFunc_080E6778 + 1
|
||||
.4byte ContestEffectFunc_080E67BC + 1
|
||||
.4byte ContestEffectFunc_080E6868 + 1
|
||||
.4byte ContestEffectFunc_080E68EC + 1
|
||||
@ -4494,8 +4494,8 @@ gComboStarterLut: ; 858CE8C
|
||||
|
||||
.align 2, 0
|
||||
|
||||
gUnknown_0858CECC: ; 858CECC
|
||||
.incbin "base_emerald.gba", 0x58cecc, 0xc0
|
||||
; 858CECC
|
||||
.include "data/contest_effect_function_table.s"
|
||||
|
||||
gUnknown_0858CF8C: ; 858CF8C
|
||||
.incbin "base_emerald.gba", 0x58cf8c, 0x2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user