diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 21:10:54 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 21:10:54 -0400 |
| commit | e130a00cdf69c58dbff8e98a69559aeb33f87b60 (patch) | |
| tree | e128e502a2229f5d934f0436a0eb31dc86350bbb /asm/battle_message.s | |
| parent | ef4c86fbfdd18b78700f61b629907a85579197c0 (diff) | |
| parent | d4cc0e161bf103d3d3e01fefa02e867d4a2053c2 (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'asm/battle_message.s')
| -rw-r--r-- | asm/battle_message.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/battle_message.s b/asm/battle_message.s index 9505d542b..efd7e1385 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -2683,7 +2683,7 @@ _080D87F2: ands r0, r1 cmp r0, 0 beq _080D881C - bl sub_80CBE00 + bl ContextNpcGetTextColor lsls r0, 24 lsrs r0, 24 mov r2, sp |