summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/rom5.s32
-rw-r--r--data/contest_effects.s291
-rw-r--r--data/data2.s5
3 files changed, 309 insertions, 19 deletions
diff --git a/asm/rom5.s b/asm/rom5.s
index 15e00fc99..c23bff3aa 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -76512,7 +76512,7 @@ _080A063A:
.align 2, 0
_080A0648: .4byte 0x06006800
_080A064C: .4byte 0x0000ffff
-_080A0650: .4byte gUnknown_083D00AC
+_080A0650: .4byte gContestEffects
_080A0654: .4byte gContestMoves
_080A0658: .4byte 0x00001039
_080A065C: .4byte 0x0000044c
@@ -105752,7 +105752,7 @@ sub_80AEB68: @ 80AEB68
ldr r0, [r0]
mov pc, r0
.align 2, 0
-_080AEB90: .4byte gUnknown_083D00AC
+_080AEB90: .4byte gContestEffects
_080AEB94: .4byte gContestMoves
_080AEB98: .4byte _080AEB9C
.align 2, 0
@@ -105868,7 +105868,7 @@ _080AEC48:
_080AEC74: .4byte 0x03004210
_080AEC78: .4byte gContestMoves
_080AEC7C: .4byte 0x00004040
-_080AEC80: .4byte gUnknown_083D00AC
+_080AEC80: .4byte gContestEffects
_080AEC84: .4byte gUnknown_083CADD4
_080AEC88: .4byte 0x0600c816
_080AEC8C: .4byte 0x0600c7d6
@@ -110943,7 +110943,7 @@ _080B123C:
b _080B128A
.align 2, 0
_080B1264: .4byte 0x02019260
-_080B1268: .4byte gUnknown_083D00AC
+_080B1268: .4byte gContestEffects
_080B126C: .4byte gUnknown_083D01AC
_080B1270:
ldrb r1, [r2, 0x11]
@@ -126164,7 +126164,7 @@ _080B8636:
.align 2, 0
_080B863C: .4byte 0x02038696
_080B8640: .4byte 0x020192d0
-_080B8644: .4byte gUnknown_083D00AC
+_080B8644: .4byte gContestEffects
_080B8648: .4byte gContestMoves
thumb_func_end sub_80B85F8
@@ -126207,7 +126207,7 @@ _080B868A:
.align 2, 0
_080B8690: .4byte 0x02038696
_080B8694: .4byte 0x020192d0
-_080B8698: .4byte gUnknown_083D00AC
+_080B8698: .4byte gContestEffects
_080B869C: .4byte gContestMoves
thumb_func_end sub_80B864C
@@ -126616,7 +126616,7 @@ _080B8994:
bx r0
.align 2, 0
_080B899C: .4byte gContestMoves
-_080B89A0: .4byte gUnknown_083D00AC
+_080B89A0: .4byte gContestEffects
thumb_func_end ContestEffectFunc_080E611C
thumb_func_start ContestEffectFunc_080E620C
@@ -126690,7 +126690,7 @@ _080B89D4:
.align 2, 0
_080B8A28: .4byte 0x020192d0
_080B8A2C: .4byte gContestMoves
-_080B8A30: .4byte gUnknown_083D00AC
+_080B8A30: .4byte gContestEffects
_080B8A34:
adds r7, 0x1C
adds r4, 0x1
@@ -358377,7 +358377,7 @@ sub_81294F0: @ 81294F0
.align 2, 0
_08129524: .4byte 0x02038570
_08129528: .4byte 0x020192e4
-_0812952C: .4byte gUnknown_083D00AC
+_0812952C: .4byte gContestEffects
_08129530: .4byte gContestMoves
_08129534: .4byte 0x02039238
thumb_func_end sub_81294F0
@@ -358504,7 +358504,7 @@ _08129608:
.align 2, 0
_08129610: .4byte 0x02038570
_08129614: .4byte 0x020192e4
-_08129618: .4byte gUnknown_083D00AC
+_08129618: .4byte gContestEffects
_0812961C: .4byte gContestMoves
_08129620: .4byte 0x02039238
_08129624:
@@ -358610,7 +358610,7 @@ _081296CC:
.align 2, 0
_081296D4: .4byte 0x02038570
_081296D8: .4byte 0x020192e4
-_081296DC: .4byte gUnknown_083D00AC
+_081296DC: .4byte gContestEffects
_081296E0: .4byte gContestMoves
_081296E4: .4byte 0x02039238
_081296E8:
@@ -358702,7 +358702,7 @@ sub_8129740: @ 8129740
.align 2, 0
_08129784: .4byte 0x02038570
_08129788: .4byte 0x020192e4
-_0812978C: .4byte gUnknown_083D00AC
+_0812978C: .4byte gContestEffects
_08129790: .4byte gContestMoves
_08129794: .4byte 0x02039238
thumb_func_end sub_8129740
@@ -358885,7 +358885,7 @@ sub_8129898: @ 8129898
.align 2, 0
_081298DC: .4byte 0x02038570
_081298E0: .4byte 0x020192e4
-_081298E4: .4byte gUnknown_083D00AC
+_081298E4: .4byte gContestEffects
_081298E8: .4byte gContestMoves
_081298EC: .4byte 0x02039238
thumb_func_end sub_8129898
@@ -360952,7 +360952,7 @@ sub_812A774: @ 812A774
.align 2, 0
_0812A7B4: .4byte 0x02039238
_0812A7B8: .4byte 0x02019204
-_0812A7BC: .4byte gUnknown_083D00AC
+_0812A7BC: .4byte gContestEffects
_0812A7C0: .4byte gContestMoves
thumb_func_end sub_812A774
@@ -379861,7 +379861,7 @@ _08133A1A:
bl StartSpriteAnim
b _08133A58
.align 2, 0
-_08133A34: .4byte gUnknown_083D00AC
+_08133A34: .4byte gContestEffects
_08133A38: .4byte gContestMoves
_08133A3C: .4byte 0x030007b0
_08133A40: .4byte 0x02020004
@@ -379923,7 +379923,7 @@ _08133A9A:
bl StartSpriteAnim
b _08133AD8
.align 2, 0
-_08133AB4: .4byte gUnknown_083D00AC
+_08133AB4: .4byte gContestEffects
_08133AB8: .4byte gContestMoves
_08133ABC: .4byte 0x030007b0
_08133AC0: .4byte 0x02020004
diff --git a/data/contest_effects.s b/data/contest_effects.s
new file mode 100644
index 000000000..27a9900e8
--- /dev/null
+++ b/data/contest_effects.s
@@ -0,0 +1,291 @@
+ .align 2
+ .global gContestEffects
+gContestEffects:
+@ 0
+ .byte 0 @ effect type
+ .byte 40 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 1
+ .byte 0 @ effect type
+ .byte 60 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 2
+ .byte 0 @ effect type
+ .byte 80 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 3
+ .byte 0 @ effect type
+ .byte 30 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 4
+ .byte 1 @ effect type
+ .byte 20 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 5
+ .byte 1 @ effect type
+ .byte 10 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 6
+ .byte 1 @ effect type
+ .byte 30 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 7
+ .byte 1 @ effect type
+ .byte 30 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 8
+ .byte 2 @ effect type
+ .byte 30 @ appeal
+ .byte 20 @ jam
+ .byte 0 @ padding
+
+@ 9
+ .byte 3 @ effect type
+ .byte 30 @ appeal
+ .byte 10 @ jam
+ .byte 0 @ padding
+
+@ 10
+ .byte 2 @ effect type
+ .byte 20 @ appeal
+ .byte 30 @ jam
+ .byte 0 @ padding
+
+@ 11
+ .byte 3 @ effect type
+ .byte 20 @ appeal
+ .byte 20 @ jam
+ .byte 0 @ padding
+
+@ 12
+ .byte 2 @ effect type
+ .byte 10 @ appeal
+ .byte 40 @ jam
+ .byte 0 @ padding
+
+@ 13
+ .byte 3 @ effect type
+ .byte 10 @ appeal
+ .byte 30 @ jam
+ .byte 0 @ padding
+
+@ 14
+ .byte 2 @ effect type
+ .byte 30 @ appeal
+ .byte 20 @ jam
+ .byte 0 @ padding
+
+@ 15
+ .byte 3 @ effect type
+ .byte 30 @ appeal
+ .byte 10 @ jam
+ .byte 0 @ padding
+
+@ 16
+ .byte 4 @ effect type
+ .byte 30 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 17
+ .byte 3 @ effect type
+ .byte 20 @ appeal
+ .byte 10 @ jam
+ .byte 0 @ padding
+
+@ 18
+ .byte 3 @ effect type
+ .byte 40 @ appeal
+ .byte 40 @ jam
+ .byte 0 @ padding
+
+@ 19
+ .byte 3 @ effect type
+ .byte 20 @ appeal
+ .byte 10 @ jam
+ .byte 0 @ padding
+
+@ 20
+ .byte 3 @ effect type
+ .byte 20 @ appeal
+ .byte 10 @ jam
+ .byte 0 @ padding
+
+@ 21
+ .byte 3 @ effect type
+ .byte 20 @ appeal
+ .byte 10 @ jam
+ .byte 0 @ padding
+
+@ 22
+ .byte 3 @ effect type
+ .byte 20 @ appeal
+ .byte 10 @ jam
+ .byte 0 @ padding
+
+@ 23
+ .byte 3 @ effect type
+ .byte 20 @ appeal
+ .byte 10 @ jam
+ .byte 0 @ padding
+
+@ 24
+ .byte 3 @ effect type
+ .byte 20 @ appeal
+ .byte 10 @ jam
+ .byte 0 @ padding
+
+@ 25
+ .byte 4 @ effect type
+ .byte 20 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 26
+ .byte 4 @ effect type
+ .byte 20 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 27
+ .byte 4 @ effect type
+ .byte 30 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 28
+ .byte 3 @ effect type
+ .byte 30 @ appeal
+ .byte 10 @ jam
+ .byte 0 @ padding
+
+@ 29
+ .byte 5 @ effect type
+ .byte 20 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 30
+ .byte 5 @ effect type
+ .byte 20 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 31
+ .byte 5 @ effect type
+ .byte 10 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 32
+ .byte 5 @ effect type
+ .byte 10 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 33
+ .byte 5 @ effect type
+ .byte 10 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 34
+ .byte 5 @ effect type
+ .byte 10 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 35
+ .byte 5 @ effect type
+ .byte 20 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 36
+ .byte 5 @ effect type
+ .byte 20 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 37
+ .byte 5 @ effect type
+ .byte 30 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 38
+ .byte 5 @ effect type
+ .byte 10 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 39
+ .byte 5 @ effect type
+ .byte 10 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 40
+ .byte 6 @ effect type
+ .byte 30 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 41
+ .byte 6 @ effect type
+ .byte 30 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 42
+ .byte 6 @ effect type
+ .byte 30 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 43
+ .byte 6 @ effect type
+ .byte 30 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 44
+ .byte 5 @ effect type
+ .byte 10 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 45
+ .byte 3 @ effect type
+ .byte 20 @ appeal
+ .byte 10 @ jam
+ .byte 0 @ padding
+
+@ 46
+ .byte 5 @ effect type
+ .byte 10 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
+@ 47
+ .byte 4 @ effect type
+ .byte 30 @ appeal
+ .byte 0 @ jam
+ .byte 0 @ padding
+
diff --git a/data/data2.s b/data/data2.s
index 4c8cd7aef..95dc46851 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -4367,9 +4367,8 @@ gUnknown_083CF58C: @ 83CF58C
@ 83CF594
.include "data/contest_moves.s"
- .global gUnknown_083D00AC
-gUnknown_083D00AC: @ 83D00AC
- .incbin "baserom.gba", 0x003d00ac, 0xc0
+@ 83D00AC
+ .include "data/contest_effects.s"
.global gUnknown_083D016C
gUnknown_083D016C: @ 83D016C
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-11 12:48:34 +0000