summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rwxr-xr-xengine/main_menu.asm2
-rwxr-xr-xengine/math.asm4
-rwxr-xr-xengine/move_mon.asm6
3 files changed, 6 insertions, 6 deletions
diff --git a/engine/main_menu.asm b/engine/main_menu.asm
index 08242ad1..7e22a02e 100755
--- a/engine/main_menu.asm
+++ b/engine/main_menu.asm
@@ -8,7 +8,7 @@ MainMenu_:
call PlayMusic
.asm_5a60
xor a
- ld [wc1d6], a
+ ld [wDisableTextAcceleration], a
call Function5bf7
ld b, $8
call GetSGBLayout
diff --git a/engine/math.asm b/engine/math.asm
index 7cc35eb4..6f584edf 100755
--- a/engine/math.asm
+++ b/engine/math.asm
@@ -1,4 +1,4 @@
-Multiply_:: ; 67bd
+_Multiply:: ; 67bd
; hMultiplier is one byte.
ld a, 8
@@ -80,7 +80,7 @@ Multiply_:: ; 67bd
ret
-Divide_:: ; 681d
+_Divide:: ; 681d
xor a
ld [hMathBuffer + 0], a
ld [hMathBuffer + 1], a
diff --git a/engine/move_mon.asm b/engine/move_mon.asm
index 70e62498..aae1390b 100755
--- a/engine/move_mon.asm
+++ b/engine/move_mon.asm
@@ -1130,7 +1130,7 @@ RemoveMonFromPartyOrBox: ; e03f (3:603f)
jr z, .asm_e096
ld bc, sBoxMonNicknames
.asm_e096
- call Function3231
+ call CopyDataUntil
ld hl, wPartyMon1
ld bc, PARTYMON_STRUCT_LENGTH
ld a, [wPokemonWithdrawDepositParameter]
@@ -1156,7 +1156,7 @@ RemoveMonFromPartyOrBox: ; e03f (3:603f)
add hl, bc
ld bc, wPartyMonOT
.asm_e0c9
- call Function3231
+ call CopyDataUntil
ld hl, wPartyMonNicknames
ld a, [wPokemonWithdrawDepositParameter]
and a
@@ -1176,7 +1176,7 @@ RemoveMonFromPartyOrBox: ; e03f (3:603f)
jr z, .asm_e0f3
ld bc, sBoxEnd
.asm_e0f3
- call Function3231
+ call CopyDataUntil
.asm_e0f6
ld a, [wPokemonWithdrawDepositParameter]
and a