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 /home | |
| parent | d1167570cc5c8db26b2bc310db8c574ba3a9a9e5 (diff) | |
Consistent labels for each nickname in RAM
Diffstat (limited to 'home')
| -rw-r--r-- | home/names.asm | 4 | ||||
| -rw-r--r-- | home/pokemon.asm | 4 | ||||
| -rw-r--r-- | home/text.asm | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/home/names.asm b/home/names.asm index 4e8e1224..dee25307 100644 --- a/home/names.asm +++ b/home/names.asm @@ -4,8 +4,8 @@ NamesPointers:: dba MoveNames ; MOVE_NAME dba NULL ; DUMMY_NAME dba ItemNames ; ITEM_NAME - dbw 0, wPartyMonOT ; PARTY_OT_NAME - dbw 0, wOTPartyMonOT ; ENEMY_OT_NAME + dbw 0, wPartyMonOTs ; PARTY_OT_NAME + dbw 0, wOTPartyMonOTs ; ENEMY_OT_NAME dba TrainerClassNames ; TRAINER_NAME dbw 4, MoveDescriptions ; MOVE_DESC_NAME_BROKEN (wrong bank) diff --git a/home/pokemon.asm b/home/pokemon.asm index 8d434089..6b16b7dd 100644 --- a/home/pokemon.asm +++ b/home/pokemon.asm @@ -268,11 +268,11 @@ GetBaseData:: pop bc ret -GetCurNick:: +GetCurNickname:: ld a, [wCurPartyMon] ld hl, wPartyMonNicknames -GetNick:: +GetNickname:: ; Get nickname a from list hl. push hl diff --git a/home/text.asm b/home/text.asm index 36fda27b..47881803 100644 --- a/home/text.asm +++ b/home/text.asm @@ -316,7 +316,7 @@ PlaceBattlersName: and a jr nz, .enemy - ld de, wBattleMonNick + ld de, wBattleMonNickname jr PlaceCommandCharacter .enemy @@ -324,7 +324,7 @@ PlaceBattlersName: call PlaceString ld h, b ld l, c - ld de, wEnemyMonNick + ld de, wEnemyMonNickname jr PlaceCommandCharacter PlaceEnemysName:: @@ -905,8 +905,8 @@ TextCommand_STRINGBUFFER:: ; 2: wStringBuffer5 ; 3: wStringBuffer2 ; 4: wStringBuffer1 -; 5: wEnemyMonNick -; 6: wBattleMonNick +; 5: wEnemyMonNickname +; 6: wBattleMonNickname ld a, [hli] push hl ld e, a |