summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2015-10-14 14:20:40 -0700
committerYamaArashi <shadow962@live.com>2015-10-14 14:20:40 -0700
commit27061f496eaeb745c7f135ebaafcf90ef861bdd8 (patch)
tree61e0c689abcf8e7be5797ff21c43d32e7d749bcd /data
parent078afb798e016a004765fbe7544fa20dc153016d (diff)
contest move effect func ptr table
Diffstat (limited to 'data')
-rw-r--r--data/contest_effect_function_table.s51
-rw-r--r--data/data2.s4
2 files changed, 53 insertions, 2 deletions
diff --git a/data/contest_effect_function_table.s b/data/contest_effect_function_table.s
new file mode 100644
index 000000000..bde47f77f
--- /dev/null
+++ b/data/contest_effect_function_table.s
@@ -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
diff --git a/data/data2.s b/data/data2.s
index 31afc5a75..091814efc 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -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