diff options
| author | Devin <easyaspi314@users.noreply.github.com> | 2018-01-21 15:22:05 -0500 |
|---|---|---|
| committer | Devin <easyaspi314@users.noreply.github.com> | 2018-01-21 15:22:05 -0500 |
| commit | 35cc20c9aa5a37f03bc0bf46bc31398aecda7bf6 (patch) | |
| tree | 59427fda7dbbb92268caf353870d0f0ed8f5e13b /asm/battle_frontier_1.s | |
| parent | c408110319885748b4fcc696063242c7002f4d30 (diff) | |
| parent | a1aa645f2364deffda698b8e0cdc5c961b5306a5 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms
Diffstat (limited to 'asm/battle_frontier_1.s')
| -rw-r--r-- | asm/battle_frontier_1.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/battle_frontier_1.s b/asm/battle_frontier_1.s index 8e82de6c6..c2517586e 100644 --- a/asm/battle_frontier_1.s +++ b/asm/battle_frontier_1.s @@ -9449,7 +9449,7 @@ _08193AA8: b _08193BC2 _08193ABA: bl FreeAllWindowBuffers - bl remove_some_task + bl ScanlineEffect_Stop ldr r4, =gUnknown_0203CD7C ldr r0, [r4] bl Free @@ -9494,7 +9494,7 @@ _08193B20: cmp r6, 0 bne _08193BC2 bl FreeAllWindowBuffers - bl remove_some_task + bl ScanlineEffect_Stop ldr r4, =gUnknown_0203CD7C ldr r0, [r4] bl Free @@ -9534,7 +9534,7 @@ _08193B84: cmp r6, 0 bne _08193BC2 bl FreeAllWindowBuffers - bl remove_some_task + bl ScanlineEffect_Stop ldr r4, =gUnknown_0203CD7C ldr r0, [r4] bl Free |