Consistent labels for each nickname in RAM

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)
 

home/pokemon.asm

@@ -298,11 +298,11 @@ GetBaseData::
 	pop bc
 	ret
 
-GetCurNick::
+GetCurNickname::
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMonNicknames
 
-GetNick::
+GetNickname::
 ; Get nickname a from list hl.
 
 	push hl

home/text.asm

@@ -336,7 +336,7 @@ PlaceBattlersName:
 	and a
 	jr nz, .enemy
 
-	ld de, wBattleMonNick
+	ld de, wBattleMonNickname
 	jr PlaceCommandCharacter
 
 .enemy
@@ -344,7 +344,7 @@ PlaceBattlersName:
 	call PlaceString
 	ld h, b
 	ld l, c
-	ld de, wEnemyMonNick
+	ld de, wEnemyMonNickname
 	jr PlaceCommandCharacter
 
 PlaceEnemysName::
@@ -1000,8 +1000,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