summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/contest_excitement_table.s7
-rw-r--r--data/data2.s5
2 files changed, 10 insertions, 2 deletions
diff --git a/data/contest_excitement_table.s b/data/contest_excitement_table.s
new file mode 100644
index 000000000..359e46c54
--- /dev/null
+++ b/data/contest_excitement_table.s
@@ -0,0 +1,7 @@
+gContestExcitementTable:: @ 83CC5B4
+ @ Cool Beauty Cute Smart Tough
+ .byte 1, 0, -1, -1, 0 @ Cool Contest
+ .byte 0, 1, 0, -1, -1 @ Beauty Contest
+ .byte -1, 0, 1, 0, -1 @ Cute Contest
+ .byte -1, -1, 0, 1, 0 @ Smart Contest
+ .byte 0, -1, -1, 0, 1 @ Tough Contest
diff --git a/data/data2.s b/data/data2.s
index ec9fc597c..72a2cc181 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -13523,9 +13523,10 @@ gUnknown_083CC5A2:: @ 83CC5A2
gUnknown_083CC5A4:: @ 83CC5A4
.incbin "baserom.gba", 0x003cc5a4, 0x10
-gUnknown_083CC5B4:: @ 83CC5B4
- .incbin "baserom.gba", 0x003cc5b4, 0x1c
+@ 83CC5B4
+ .include "data/contest_excitement_table.s"
+ .align 2
gUnknown_083CC5D0:: @ 83CC5D0
.incbin "baserom.gba", 0x003cc5d0, 0x100