diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-16 08:36:51 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-16 19:00:07 -0500 |
| commit | 236cbf96c8f94b8b2d23be8c72ee0e188e82842d (patch) | |
| tree | c2042f78efdc37a5b64c9cd797cc0c66a0c80255 /asm/wild_encounter.s | |
| parent | 50501396b21bf132cf71d0f5d353bf51d277ba27 (diff) | |
| parent | c0d180a8702b9b20afe07b09316286f6406e5811 (diff) | |
Merge origin/master into pikalaxalt/link
Diffstat (limited to 'asm/wild_encounter.s')
| -rw-r--r-- | asm/wild_encounter.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/wild_encounter.s b/asm/wild_encounter.s index 9b6c901f6..70346e4d7 100644 --- a/asm/wild_encounter.s +++ b/asm/wild_encounter.s @@ -1628,12 +1628,12 @@ rock_smash_wild_pokemon_encounter: @ 80B550C bne _080B5568 bl sub_80B0698 _080B5554: - ldr r0, =gScriptResult + ldr r0, =gSpecialVar_Result strh r4, [r0] b _080B556E .pool _080B5568: - ldr r1, =gScriptResult + ldr r1, =gSpecialVar_Result movs r0, 0 strh r0, [r1] _080B556E: @@ -2026,7 +2026,7 @@ sub_80B5870: @ 80B5870 bl VarSet cmp r4, 0 bne _080B58C4 - ldr r0, =gUnknown_082A4B2A + ldr r0, =EventScript_RepelWoreOff bl ScriptContext1_SetupScript movs r0, 0x1 b _080B58C6 |