diff options
Diffstat (limited to 'data')
-rw-r--r-- | data/contest_effects.s | 291 | ||||
-rw-r--r-- | data/data2.s | 5 |
2 files changed, 293 insertions, 3 deletions
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 |