diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-17 16:16:02 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-17 16:38:21 -0400 |
| commit | 4522162d4578ab40a071efec9e1fa28c2756e596 (patch) | |
| tree | 3f04ac12fac11d6aa0782cc72acbe358213845a4 /engine/battle | |
| parent | 6c8f8609cb0d8dce34c6f8125267edfa11bbb3f1 (diff) | |
Consistent labels for each nickname in RAM
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/core.asm | 14 | ||||
| -rw-r--r-- | engine/battle/move_effects/beat_up.asm | 2 | ||||
| -rw-r--r-- | engine/battle/read_trainer_party.asm | 2 |
3 files changed, 9 insertions, 9 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 diff --git a/engine/battle/move_effects/beat_up.asm b/engine/battle/move_effects/beat_up.asm index a52ecabed..2bd6cb458 100644 --- a/engine/battle/move_effects/beat_up.asm +++ b/engine/battle/move_effects/beat_up.asm @@ -28,7 +28,7 @@ BattleCommand_BeatUp: .got_mon ld a, [wCurBeatUpPartyMon] ld hl, wPartyMonNicknames - call GetNick + call GetNickname ld a, MON_HP call GetBeatupMonLocation ld a, [hli] diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm index cf7de20c6..238c316f6 100644 --- a/engine/battle/read_trainer_party.asm +++ b/engine/battle/read_trainer_party.asm @@ -14,7 +14,7 @@ ReadTrainerParty: ld [hl], a ld hl, wOTPartyMons - ld bc, wOTPartyMonsEnd - wOTPartyMons + ld bc, PARTYMON_STRUCT_LENGTH * PARTY_LENGTH xor a call ByteFill |