summaryrefslogtreecommitdiff
path: root/engine/battle/core.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/battle/core.asm')
-rw-r--r--engine/battle/core.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index aa197bea2..654559b89 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -3885,7 +3885,7 @@ InitBattleMon:
ld hl, wPartyMonNicknames
ld a, [wCurBattleMon]
call SkipNames
- ld de, wBattleMonNick
+ ld de, wBattleMonNickname
ld bc, MON_NAME_LENGTH
call CopyBytes
ld hl, wBattleMonAttack
@@ -3965,7 +3965,7 @@ InitEnemyMon:
ld hl, wOTPartyMonNicknames
ld a, [wCurPartyMon]
call SkipNames
- ld de, wEnemyMonNick
+ ld de, wEnemyMonNickname
ld bc, MON_NAME_LENGTH
call CopyBytes
ld hl, wEnemyMonAttack
@@ -4642,7 +4642,7 @@ CheckDanger:
ret
PrintPlayerHUD:
- ld de, wBattleMonNick
+ ld de, wBattleMonNickname
hlcoord 10, 7
call Battle_DummyFunction
call PlaceString
@@ -4728,7 +4728,7 @@ DrawEnemyHUD:
ld [wCurSpecies], a
ld [wCurPartySpecies], a
call GetBaseData
- ld de, wEnemyMonNick
+ ld de, wEnemyMonNickname
hlcoord 1, 0
call Battle_DummyFunction
call PlaceString
@@ -6394,7 +6394,7 @@ LoadEnemyMon:
; Update enemy nick
ld hl, wStringBuffer1
- ld de, wEnemyMonNick
+ ld de, wEnemyMonNickname
ld bc, MON_NAME_LENGTH
call CopyBytes
@@ -7112,7 +7112,7 @@ GiveExperiencePoints:
ld [wStringBuffer2], a
ld a, [wCurPartyMon]
ld hl, wPartyMonNicknames
- call GetNick
+ call GetNickname
ld hl, Text_MonGainedExpPoint
call BattleTextbox
ld a, [wStringBuffer2 + 1]
@@ -7523,7 +7523,7 @@ AnimateExpBar:
ld c, $40
call .LoopBarAnimation
call PrintPlayerHUD
- ld hl, wBattleMonNick
+ ld hl, wBattleMonNickname
ld de, wStringBuffer1
ld bc, MON_NAME_LENGTH
call CopyBytes