diff options
| author | YamaArashi <shadow962@live.com> | 2015-10-14 13:17:58 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-10-14 13:17:58 -0700 |
| commit | dd8f08f8a8a4bf4a313d9537a19601902ff3f425 (patch) | |
| tree | 8cdba15c08f4f9635c94d20efe083da73b9fc3d9 /asm/emerald.s | |
| parent | 6dd8d212c6c1e808452ab3e76d7830427fed7b68 (diff) | |
some contest text
Diffstat (limited to 'asm/emerald.s')
| -rw-r--r-- | asm/emerald.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/emerald.s b/asm/emerald.s index 9ec0f4594..e9214d7f5 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -415904,7 +415904,7 @@ prints_contest_move_description: ; 80DB370 movs r0, 0xA movs r1, 0 bl Window_FastFillPixels - ldr r1, =gUnknown_08587C50 + ldr r1, =gContestEffectDescriptionPointers ldr r0, =gContestMoves adds r0, r7, r0 ldrb r0, [r0] @@ -435940,7 +435940,7 @@ sub_80E5414: ; 80E5414 cmp r4, r1 bne @080E5470 @080E545E: - ldr r0, =gUnknown_0858CE8C + ldr r0, =gComboStarterLut adds r0, r4, r0 ldrb r0, [r0] b @080E5472 @@ -436944,7 +436944,7 @@ sub_80E5AD4: ; 80E5AD4 ldr r1, =gContestMoves adds r0, r1 ldrb r0, [r0, 0x2] - ldr r2, =gUnknown_0858CE8C + ldr r2, =gComboStarterLut adds r0, r2 ldrb r1, [r0] lsls r0, r1, 2 @@ -872808,7 +872808,7 @@ sub_81C3E2C: ; 81C3E2C bl sub_81C2D2C lsls r0, 24 lsrs r0, 24 - ldr r3, =gUnknown_08587C50 + ldr r3, =gContestEffectDescriptionPointers ldr r2, =gContestMoves lsls r1, r4, 3 adds r1, r2 @@ -872873,7 +872873,7 @@ sub_81C3E9C: ; 81C3E9C .align 2, 0 .pool @081C3F00: - ldr r2, =gUnknown_08587C50 + ldr r2, =gContestEffectDescriptionPointers ldr r1, =gContestMoves lsls r0, r6, 3 adds r0, r1 @@ -903170,7 +903170,7 @@ sub_81D2ACC: ; 81D2ACC lsls r4, 3 ldr r0, =gContestMoves adds r4, r0 - ldr r1, =gUnknown_08587D48 + ldr r1, =gContestMoveTypeTextPointers ldrb r0, [r4, 0x1] lsls r0, 29 lsrs r0, 27 @@ -903185,7 +903185,7 @@ sub_81D2ACC: ; 81D2ACC adds r2, r5, 0 movs r3, 0x4 bl Print - ldr r1, =gUnknown_08587C50 + ldr r1, =gContestEffectDescriptionPointers ldrb r0, [r4] lsls r0, 2 adds r0, r1 |