diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-12-28 03:00:15 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-12-28 03:00:15 -0600 |
| commit | 1496ea3a24f188cad26ac40f5bfcc3e571f3311a (patch) | |
| tree | a0b00c058bd7234b9140b4636b08016278f1b049 /asm/field_specials.s | |
| parent | 2d04eb22abd3f60902ee1f9bc87bd510518709e3 (diff) | |
| parent | 87958f2f87b9f7f6e5548d9cb2ac53c3339b78d5 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'asm/field_specials.s')
| -rw-r--r-- | asm/field_specials.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/field_specials.s b/asm/field_specials.s index 608924603..ec4ce00b5 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -32,10 +32,10 @@ Special_ViewWallClock: @ 8137CC8 thumb_func_start ResetCyclingRoadChallengeData ResetCyclingRoadChallengeData: @ 8137CEC - ldr r0, =gUnknown_0203AB54 + ldr r0, =gBikeCyclingChallenge movs r1, 0 strb r1, [r0] - ldr r0, =gUnknown_0203AB55 + ldr r0, =0x0203ab55 strb r1, [r0] ldr r1, =gUnknown_0203AB58 movs r0, 0 @@ -46,10 +46,10 @@ ResetCyclingRoadChallengeData: @ 8137CEC thumb_func_start Special_BeginCyclingRoadChallenge Special_BeginCyclingRoadChallenge: @ 8137D0C - ldr r1, =gUnknown_0203AB54 + ldr r1, =gBikeCyclingChallenge movs r0, 0x1 strb r0, [r1] - ldr r1, =gUnknown_0203AB55 + ldr r1, =0x0203ab55 movs r0, 0 strb r0, [r1] ldr r1, =gUnknown_0203AB58 @@ -218,7 +218,7 @@ FinishCyclingRoadChallenge: @ 8137E6C ldr r4, [r0, 0x20] ldr r0, [r1] subs r4, r0 - ldr r5, =gUnknown_0203AB55 + ldr r5, =0x0203ab55 ldrb r1, [r5] adds r0, r4, 0 bl DetermineCyclingRoadResults |