summaryrefslogtreecommitdiff
path: root/engine/battle
diff options
context:
space:
mode:
Diffstat (limited to 'engine/battle')
-rwxr-xr-xengine/battle/4.asm4
-rwxr-xr-xengine/battle/9.asm4
-rwxr-xr-xengine/battle/animations.asm4
3 files changed, 6 insertions, 6 deletions
diff --git a/engine/battle/4.asm b/engine/battle/4.asm
index b19b3b49..7a8e42af 100755
--- a/engine/battle/4.asm
+++ b/engine/battle/4.asm
@@ -16,12 +16,12 @@ Func_128ea: ; 128ea (4:68ea)
ret
Func_128ef: ; 128ef (4:68ef)
- call Load16BitRegisters
+ call GetPredefRegisters
ld a, $1
jr asm_128fb
Func_128f6: ; 128f6 (4:68f6)
- call Load16BitRegisters
+ call GetPredefRegisters
ld a, $2
asm_128fb: ; 128fb (4:68fb)
ld [wListMenuID], a ; $cf94
diff --git a/engine/battle/9.asm b/engine/battle/9.asm
index 79624d34..a2f846a2 100755
--- a/engine/battle/9.asm
+++ b/engine/battle/9.asm
@@ -1,5 +1,5 @@
Func_27d6b: ; 27d6b (9:7d6b)
- call Load16BitRegisters
+ call GetPredefRegisters
push hl
call GetMonHeader
pop hl
@@ -26,7 +26,7 @@ asm_27d8c: ; 27d8c (9:7d8c)
jp FillMemory
Func_27d98: ; 27d98 (9:7d98)
- call Load16BitRegisters
+ call GetPredefRegisters
push hl
ld a, [W_PLAYERMOVETYPE] ; $cfd5
asm_27d9f: ; 27d9f (9:7d9f)
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index aaa65bbb..8f4cbcd5 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -2509,7 +2509,7 @@ Func_79aae: ; 79aae (1e:5aae)
jr asm_79acb
Func_79aba: ; 79aba (1e:5aba)
- call Load16BitRegisters
+ call GetPredefRegisters
ld a, [$cd6c]
and a
jr nz, .asm_79ac8
@@ -2790,7 +2790,7 @@ AnimationShakeEnemyHUD: ; 79d77 (1e:5d77)
jp Func_79e0d
Func_79dda: ; 79dda (1e:5dda)
- call Load16BitRegisters
+ call GetPredefRegisters
ld a, c
ld [H_DOWNARROWBLINKCNT1], a ; $ff8b
ld a, b