diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-01-27 23:08:24 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-27 23:08:24 -0600 |
| commit | 183b6857ff21c50c0902653d6ded9e4d7f306033 (patch) | |
| tree | 18feaf7941ded29a2c4489511e1dc275e193c878 /data | |
| parent | 6b2dda422b533bf0edadcd727f4b491e4e6f4fb7 (diff) | |
| parent | 72720204da48a77132ce17c2429aaa9854497e2c (diff) | |
Merge pull request #458 from ultima-soul/contest
Decompile more of contest
Diffstat (limited to 'data')
| -rw-r--r-- | data/contest.s | 2 | ||||
| -rw-r--r-- | data/text/contest_strings.inc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/data/contest.s b/data/contest.s index eaf3f8c95..48bfa1080 100644 --- a/data/contest.s +++ b/data/contest.s @@ -406,7 +406,7 @@ gSpriteTemplate_858998C:: @ 858998C spr_template 0x80eb, 0x80eb, gOamData_8589944, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8589984, SpriteCallbackDummy .align 2 -gUnknown_085899EC:: @ 85899EC +gContestExcitementTable:: @ 85899EC .2byte 0x0001, 0xffff, 0x0000, 0x0001, 0xffff, 0x00ff, 0x0001, 0xffff, 0x00ff, 0x0001, 0xff00, 0x00ff, 0x0001, 0x0000 diff --git a/data/text/contest_strings.inc b/data/text/contest_strings.inc index 737e4b862..1406ba3cb 100644 --- a/data/text/contest_strings.inc +++ b/data/text/contest_strings.inc @@ -665,19 +665,19 @@ gText_0827E817:: @ 827E817 .string "{STR_VAR_1}'s\n" .string "{STR_VAR_2} is ignored.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" -gText_0827E837:: @ 827E837 +gText_Contest_Shyness:: @ 827E837 .string "shyness$" -gText_0827E83F:: @ 827E83F +gText_Contest_Anxiety:: @ 827E83F .string "anxiety$" -gText_0827E847:: @ 827E847 +gText_Contest_Laziness:: @ 827E847 .string "laziness$" -gText_0827E850:: @ 827E850 +gText_Contest_Hesitancy:: @ 827E850 .string "hesitancy$" -gText_0827E85A:: @ 827E85A +gText_Contest_Fear:: @ 827E85A .string "fear$" gText_0827E85F:: @ 827E85F |