summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/engine/bank02.asm7
-rw-r--r--src/engine/bank06.asm4
2 files changed, 6 insertions, 5 deletions
diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm
index f71442d..a11b16a 100644
--- a/src/engine/bank02.asm
+++ b/src/engine/bank02.asm
@@ -1458,7 +1458,7 @@ Func_8764: ; 8764 (2:4764)
.asm_87e7
cp $ff
jr nz, .asm_87f0
- call Func_8aa1
+ call ZeroObjectPositionsWithCopyToggleOn
jr .swap
.asm_87f0
ld hl, .asm_87f8
@@ -1750,7 +1750,7 @@ Func_89ae: ; 89ae (2:49ae)
and $0f
ret nz
bit 4, [hl]
- jr nz, Func_8aa1
+ jr nz, ZeroObjectPositionsWithCopyToggleOn
Func_8a82 ; 8a82 (2:4a82)
call ZeroObjectPositions
@@ -1775,8 +1775,9 @@ Func_8a82 ; 8a82 (2:4a82)
or a
ret
-Func_8aa1: ; 8aa1 (2:4aa1)
+ZeroObjectPositionsWithCopyToggleOn: ; 8aa1 (2:4aa1)
call ZeroObjectPositions
+
ld a, $01
ld [wVBlankOAMCopyToggle], a
ret
diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm
index 00059e4..e3ee426 100644
--- a/src/engine/bank06.asm
+++ b/src/engine/bank06.asm
@@ -753,12 +753,12 @@ OpenGlossaryScreen: ; 184c8 (6:44c8)
cp -1 ; b button
jr nz, .check_button
- farcall Func_8aa1
+ farcall ZeroObjectPositionsWithCopyToggleOn
ret
.check_button
push af
- farcall Func_8aa1
+ farcall ZeroObjectPositionsWithCopyToggleOn
pop af
cp $09 ; $09: next page or prev page