summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-05-30 21:43:45 -0700
committerYamaArashi <shadow962@live.com>2016-05-30 21:43:45 -0700
commitcce1ca7921b9237b3cfb950ad77485438c7c4454 (patch)
tree838c66cad2b36a3bec0d03e81436bc5b53565518 /data
parentffd70ca9ebc62ba39347dad743eda44b29dc4a65 (diff)
contest effect functions
Diffstat (limited to 'data')
-rw-r--r--data/contest_effect_funcs.s51
-rw-r--r--data/data2.s6
2 files changed, 53 insertions, 4 deletions
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