diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-17 16:29:28 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-17 16:38:30 -0400 |
| commit | afd42efb6058a7cd19b847e5393b07e7e4fdbb95 (patch) | |
| tree | 79b71efd95bae359ce02b66a4ceeee18148292ab /engine/battle/core.asm | |
| parent | d1167570cc5c8db26b2bc310db8c574ba3a9a9e5 (diff) | |
Consistent labels for each nickname in RAM
Diffstat (limited to 'engine/battle/core.asm')
| -rw-r--r-- | engine/battle/core.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 063383bf..f644f6bd 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3657,7 +3657,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 @@ -3737,7 +3737,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 @@ -4406,7 +4406,7 @@ CheckDanger: ret PrintPlayerHUD: - ld de, wBattleMonNick + ld de, wBattleMonNickname hlcoord 10, 7 call Battle_DummyFunction call PlaceString @@ -4492,7 +4492,7 @@ DrawEnemyHUD: ld [wCurSpecies], a ld [wCurPartySpecies], a call GetBaseData - ld de, wEnemyMonNick + ld de, wEnemyMonNickname hlcoord 1, 0 call Battle_DummyFunction call PlaceString @@ -6168,7 +6168,7 @@ LoadEnemyMon: ; Update enemy nick ld hl, wStringBuffer1 - ld de, wEnemyMonNick + ld de, wEnemyMonNickname ld bc, MON_NAME_LENGTH call CopyBytes @@ -6847,7 +6847,7 @@ GiveExperiencePoints: ld [wStringBuffer2], a ld a, [wCurPartyMon] ld hl, wPartyMonNicknames - call GetNick + call GetNickname ld hl, Text_MonGainedExpPoint call PrintText ld a, [wStringBuffer2 + 1] @@ -7242,7 +7242,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 |