diff options
| author | YamaArashi <shadow962@live.com> | 2016-08-18 13:39:35 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-08-18 13:39:35 -0700 |
| commit | bf16a694c41c9b6ed447367b4a5dd72ec2d6c4f5 (patch) | |
| tree | 6a3169b8092ff51288106fc9717c597148ed1fa2 | |
| parent | 777bf67891ec5428605a42b19809e9a82c1d1759 (diff) | |
contest excitement table
| -rw-r--r-- | asm/rom5.s | 2 | ||||
| -rw-r--r-- | data/contest_excitement_table.s | 7 | ||||
| -rw-r--r-- | data/data2.s | 5 |
3 files changed, 11 insertions, 3 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 9df942e23..c123e66d8 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -111946,7 +111946,7 @@ sub_80B19FC: @ 80B19FC ldrsb r0, [r1, r0] bx lr .align 2, 0 -_080B1A20: .4byte gUnknown_083CC5B4 +_080B1A20: .4byte gContestExcitementTable _080B1A24: .4byte gContestMoves _080B1A28: .4byte 0x0203869c thumb_func_end sub_80B19FC 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 |