copy contest effect from ruby

This commit is contained in:
DizzyEggg
2018-08-12 23:20:17 +02:00
parent 335f4c1e81
commit 0d68af7f06
13 changed files with 1750 additions and 6047 deletions
+1 -17
View File
@@ -3,20 +3,4 @@
.section .rodata
@ 858C2B4
.include "data/contest_moves.inc"
@ 858CDCC
.include "data/contest_effects.inc"
@ A lookup table with a 1 for each combo starter ID and a 0 for ID 0,
@ which means "not a combo starter move".
gComboStarterLookupTable:: @ 858CE8C
.byte 0
.rept 62
.byte 1
.endr
.align 2
@ 858CECC
.include "data/contest_effect_function_table.inc"
.align 2
-50
View File
@@ -1,50 +0,0 @@
.align 2
gContestEffectFunctionTable:: @ 858CECC
.4byte ContestEffectFunc_080E547C
.4byte ContestEffectFunc_080E5480
.4byte ContestEffectFunc_080E54B0
.4byte ContestEffectFunc_080E54E0
.4byte ContestEffectFunc_080E5534
.4byte ContestEffectFunc_080E5560
.4byte ContestEffectFunc_080E5590
.4byte ContestEffectFunc_080E55BC
.4byte ContestEffectFunc_080E55EC
.4byte ContestEffectFunc_080E5664
.4byte ContestEffectFunc_080E55EC
.4byte ContestEffectFunc_080E5664
.4byte ContestEffectFunc_080E55EC
.4byte ContestEffectFunc_080E5664
.4byte ContestEffectFunc_080E56E0
.4byte ContestEffectFunc_080E5718
.4byte ContestEffectFunc_080E57CC
.4byte ContestEffectFunc_080E588C
.4byte ContestEffectFunc_080E5938
.4byte ContestEffectFunc_080E5970
.4byte ContestEffectFunc_080E59B0
.4byte ContestEffectFunc_080E59D0
.4byte ContestEffectFunc_080E59F0
.4byte ContestEffectFunc_080E5A10
.4byte ContestEffectFunc_080E5A30
.4byte ContestEffectFunc_080E5A50
.4byte ContestEffectFunc_080E5AD4
.4byte ContestEffectFunc_080E5CD4
.4byte ContestEffectFunc_080E5D7C
.4byte ContestEffectFunc_080E5E04
.4byte ContestEffectFunc_080E5E5C
.4byte ContestEffectFunc_080E5EB4
.4byte ContestEffectFunc_080E5F64
.4byte ContestEffectFunc_080E5FE4
.4byte ContestEffectFunc_080E6068
.4byte ContestEffectFunc_080E611C
.4byte ContestEffectFunc_080E620C
.4byte ContestEffectFunc_080E62B8
.4byte ContestEffectFunc_080E6334
.4byte ContestEffectFunc_080E6398
.4byte ContestEffectFunc_080E63E8
.4byte ContestEffectFunc_080E6520
.4byte ContestEffectFunc_080E6664
.4byte ContestEffectFunc_080E6668
.4byte ContestEffectFunc_080E6778
.4byte ContestEffectFunc_080E67BC
.4byte ContestEffectFunc_080E6868
.4byte ContestEffectFunc_080E68EC
-289
View File
@@ -1,289 +0,0 @@
.align 2
gContestEffects:: @ 858CDCC
@ 0x00
.byte 0 @ effect type
.byte 40 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x01
.byte 0 @ effect type
.byte 60 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x02
.byte 0 @ effect type
.byte 80 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x03
.byte 0 @ effect type
.byte 30 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x04
.byte 1 @ effect type
.byte 20 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x05
.byte 1 @ effect type
.byte 10 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x06
.byte 1 @ effect type
.byte 30 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x07
.byte 1 @ effect type
.byte 30 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x08
.byte 2 @ effect type
.byte 30 @ appeal
.byte 20 @ jam
.byte 0 @ padding
@ 0x09
.byte 3 @ effect type
.byte 30 @ appeal
.byte 10 @ jam
.byte 0 @ padding
@ 0x0a
.byte 2 @ effect type
.byte 20 @ appeal
.byte 30 @ jam
.byte 0 @ padding
@ 0x0b
.byte 3 @ effect type
.byte 20 @ appeal
.byte 20 @ jam
.byte 0 @ padding
@ 0x0c
.byte 2 @ effect type
.byte 10 @ appeal
.byte 40 @ jam
.byte 0 @ padding
@ 0x0d
.byte 3 @ effect type
.byte 10 @ appeal
.byte 30 @ jam
.byte 0 @ padding
@ 0x0e
.byte 2 @ effect type
.byte 30 @ appeal
.byte 20 @ jam
.byte 0 @ padding
@ 0x0f
.byte 3 @ effect type
.byte 30 @ appeal
.byte 10 @ jam
.byte 0 @ padding
@ 0x10
.byte 4 @ effect type
.byte 30 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x11
.byte 3 @ effect type
.byte 20 @ appeal
.byte 10 @ jam
.byte 0 @ padding
@ 0x12
.byte 3 @ effect type
.byte 40 @ appeal
.byte 40 @ jam
.byte 0 @ padding
@ 0x13
.byte 3 @ effect type
.byte 20 @ appeal
.byte 10 @ jam
.byte 0 @ padding
@ 0x14
.byte 3 @ effect type
.byte 20 @ appeal
.byte 10 @ jam
.byte 0 @ padding
@ 0x15
.byte 3 @ effect type
.byte 20 @ appeal
.byte 10 @ jam
.byte 0 @ padding
@ 0x16
.byte 3 @ effect type
.byte 20 @ appeal
.byte 10 @ jam
.byte 0 @ padding
@ 0x17
.byte 3 @ effect type
.byte 20 @ appeal
.byte 10 @ jam
.byte 0 @ padding
@ 0x18
.byte 3 @ effect type
.byte 20 @ appeal
.byte 10 @ jam
.byte 0 @ padding
@ 0x19
.byte 4 @ effect type
.byte 20 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x1a
.byte 4 @ effect type
.byte 20 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x1b
.byte 4 @ effect type
.byte 30 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x1c
.byte 3 @ effect type
.byte 30 @ appeal
.byte 10 @ jam
.byte 0 @ padding
@ 0x1d
.byte 5 @ effect type
.byte 20 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x1e
.byte 5 @ effect type
.byte 20 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x1f
.byte 5 @ effect type
.byte 10 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x20
.byte 5 @ effect type
.byte 10 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x21
.byte 5 @ effect type
.byte 10 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x22
.byte 5 @ effect type
.byte 10 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x23
.byte 5 @ effect type
.byte 20 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x24
.byte 5 @ effect type
.byte 20 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x25
.byte 5 @ effect type
.byte 30 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x26
.byte 5 @ effect type
.byte 10 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x27
.byte 5 @ effect type
.byte 10 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x28
.byte 6 @ effect type
.byte 30 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x29
.byte 6 @ effect type
.byte 30 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x2a
.byte 6 @ effect type
.byte 30 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x2b
.byte 6 @ effect type
.byte 30 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x2c
.byte 5 @ effect type
.byte 10 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x2d
.byte 3 @ effect type
.byte 20 @ appeal
.byte 10 @ jam
.byte 0 @ padding
@ 0x2e
.byte 5 @ effect type
.byte 10 @ appeal
.byte 0 @ jam
.byte 0 @ padding
@ 0x2f
.byte 4 @ effect type
.byte 30 @ appeal
.byte 0 @ jam
.byte 0 @ padding
File diff suppressed because it is too large Load Diff