summaryrefslogtreecommitdiff
path: root/src/home
diff options
context:
space:
mode:
authorElectroDeoxys <ElectroDeoxys@gmail.com>2021-09-23 18:37:05 +0100
committerElectroDeoxys <ElectroDeoxys@gmail.com>2021-09-23 18:37:05 +0100
commitca15abf2ffc14fdb92079f6fccff09eb04305d18 (patch)
treed558ad09e12c7e6ed497f64573f858eb1fb9fa60 /src/home
parent8dee6b7a11e85d6d4b9f8ec9fb9d53a499fd37dc (diff)
Split bank1
Diffstat (limited to 'src/home')
-rw-r--r--src/home/clear_sram.asm4
-rw-r--r--src/home/script.asm6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/home/clear_sram.asm b/src/home/clear_sram.asm
index a899b08..63aac1a 100644
--- a/src/home/clear_sram.asm
+++ b/src/home/clear_sram.asm
@@ -18,7 +18,7 @@ ValidateSRAM:
jr nz, .check_pattern_loop
call RestartSRAM
scf
- call Func_4050
+ call InitSaveDataAndSetUppercase
call DisableSRAM
ret
.check_sequence
@@ -36,7 +36,7 @@ ValidateSRAM:
.restart_sram
call RestartSRAM
or a
- call Func_4050
+ call InitSaveDataAndSetUppercase
call DisableSRAM
ret
diff --git a/src/home/script.asm b/src/home/script.asm
index 229eb65..aee96ff 100644
--- a/src/home/script.asm
+++ b/src/home/script.asm
@@ -158,11 +158,11 @@ Func_3b31:
ld a, BANK(Func_1cb18)
call BankswitchROM
call Func_1cb18
- jr c, .asm_3b45
+ jr c, .skip_clear_frame_func
xor a
- ld [wDoFrameFunction], a
+ ld [wDoFrameFunction + 0], a
ld [wDoFrameFunction + 1], a
-.asm_3b45
+.skip_clear_frame_func
call ZeroObjectPositions
ld a, 1
ld [wVBlankOAMCopyToggle], a