Consistent labels for each nickname in RAM

13 files changed, 58 insertions, 58 deletions

diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm
index 2902d9ef..b0b4c158 100644
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -1687,7 +1687,7 @@ BillsPC_CopyMon:
 	call CopySpeciesToTemp
 	ld hl, sBoxMonNicknames
 	call CopyNicknameToTemp
-	ld hl, sBoxMonOT
+	ld hl, sBoxMonOTs
 	call CopyOTNameToTemp
 	ld hl, sBoxMons
 	ld bc, BOXMON_STRUCT_LENGTH
@@ -1705,7 +1705,7 @@ BillsPC_CopyMon:
 	call CopySpeciesToTemp
 	ld hl, wPartyMonNicknames
 	call CopyNicknameToTemp
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 	call CopyOTNameToTemp
 	ld hl, wPartyMon1
 	ld bc, PARTYMON_STRUCT_LENGTH
@@ -1731,7 +1731,7 @@ BillsPC_CopyMon:
 	call CopyNicknameToTemp
 	pop hl
 	push hl
-	ld bc, sBoxMonOT - sBox
+	ld bc, sBoxMonOTs - sBox
 	add hl, bc
 	call CopyOTNameToTemp
 	pop hl
@@ -1750,7 +1750,7 @@ DepositPokemon:
 	ld [wCurPartyMon], a
 	ld hl, wPartyMonNicknames
 	ld a, [wCurPartyMon]
-	call GetNick
+	call GetNickname
 	ld a, PC_DEPOSIT
 	ld [wPokemonWithdrawDepositParameter], a
 	predef SendGetMonIntoFromBox
@@ -1804,7 +1804,7 @@ TryWithdrawPokemon:
 	call OpenSRAM
 	ld a, [wCurPartyMon]
 	ld hl, sBoxMonNicknames
-	call GetNick
+	call GetNickname
 	call CloseSRAM
 	xor a
 	ld [wPokemonWithdrawDepositParameter], a
@@ -2029,7 +2029,7 @@ MovePKMNWitoutMail_InsertMon:
 	call CopySpeciesToTemp
 	ld hl, sBoxMonNicknames
 	call CopyNicknameToTemp
-	ld hl, sBoxMonOT
+	ld hl, sBoxMonOTs
 	call CopyOTNameToTemp
 	ld hl, sBoxMons
 	ld bc, BOXMON_STRUCT_LENGTH
@@ -2062,7 +2062,7 @@ MovePKMNWitoutMail_InsertMon:
 	call CopySpeciesToTemp
 	ld hl, wPartyMonNicknames
 	call CopyNicknameToTemp
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 	call CopyOTNameToTemp
 	ld hl, wPartyMon1Species
 	ld bc, PARTYMON_STRUCT_LENGTH
@@ -2093,7 +2093,7 @@ CopyNicknameToTemp:
 	ld bc, MON_NAME_LENGTH
 	ld a, [wCurPartyMon]
 	call AddNTimes
-	ld de, wBufferMonNick
+	ld de, wBufferMonNickname
 	ld bc, MON_NAME_LENGTH
 	call CopyBytes
 	ret
diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm
index da282b7f..64bcb4e1 100644
--- a/engine/pokemon/breeding.asm
+++ b/engine/pokemon/breeding.asm
@@ -301,7 +301,7 @@ HatchEggs:
 	ld a, [wPlayerID + 1]
 	ld [hl], a
 	ld a, [wCurPartyMon]
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 	ld bc, NAME_LENGTH
 	call AddNTimes
 	ld d, h
@@ -854,7 +854,7 @@ DayCareMon1:
 	bit DAYCARELADY_HAS_MON_F, a
 	jr z, DayCareMonCursor
 	call PromptButton
-	ld hl, wBreedMon2Nick
+	ld hl, wBreedMon2Nickname
 	call DayCareMonCompatibilityText
 	jp PrintText
 
@@ -867,7 +867,7 @@ DayCareMon2:
 	bit DAYCAREMAN_HAS_MON_F, a
 	jr z, DayCareMonCursor
 	call PromptButton
-	ld hl, wBreedMon1Nick
+	ld hl, wBreedMon1Nickname
 	call DayCareMonCompatibilityText
 	jp PrintText
 
diff --git a/engine/pokemon/caught_nickname.asm b/engine/pokemon/caught_nickname.asm
index ff26887d..5c1eb53d 100644
--- a/engine/pokemon/caught_nickname.asm
+++ b/engine/pokemon/caught_nickname.asm
@@ -31,7 +31,7 @@ CheckPartyFullAfterContest:
 	call CopyBytes
 	ld a, [wPartyCount]
 	dec a
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 	call SkipNames
 	ld d, h
 	ld e, l
diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm
index b5ac3074..678c87a8 100644
--- a/engine/pokemon/evolve.asm
+++ b/engine/pokemon/evolve.asm
@@ -202,7 +202,7 @@ EvolveAfterBattle_MasterLoop:
 	ld [wEvolutionNewSpecies], a
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMonNicknames
-	call GetNick
+	call GetNickname
 	call CopyName1
 	ld hl, EvolvingText
 	call PrintText
diff --git a/engine/pokemon/learn.asm b/engine/pokemon/learn.asm
index 2c597c7b..c7728249 100644
--- a/engine/pokemon/learn.asm
+++ b/engine/pokemon/learn.asm
@@ -2,7 +2,7 @@ LearnMove:
 	call LoadTilemapToTempTilemap
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMonNicknames
-	call GetNick
+	call GetNickname
 	ld hl, wStringBuffer1
 	ld de, wMonOrItemNameBuffer
 	ld bc, MON_NAME_LENGTH
diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm
index e9cc1551..e70f0ec5 100644
--- a/engine/pokemon/mail.asm
+++ b/engine/pokemon/mail.asm
@@ -213,7 +213,7 @@ GivePokeMail::
 	call CopyBytes
 	pop af
 	push af
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 	ld bc, NAME_LENGTH
 	call AddNTimes
 	ld bc, NAME_LENGTH - 1
diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm
index 5289cb69..8d14ca36 100644
--- a/engine/pokemon/mon_menu.asm
+++ b/engine/pokemon/mon_menu.asm
@@ -109,7 +109,7 @@ PokemonActionSubmenu:
 	lb bc, 2, 18
 	call ClearBox
 	farcall MonSubmenu
-	call GetCurNick
+	call GetCurNickname
 	ld a, [wMenuSelection]
 	ld hl, .Actions
 	ld de, 3
@@ -210,7 +210,7 @@ GiveTakePartyMonItem:
 	call ExitMenu
 	jr c, .cancel
 
-	call GetCurNick
+	call GetCurNickname
 	ld hl, wStringBuffer1
 	ld de, wMonOrItemNameBuffer
 	ld bc, MON_NAME_LENGTH
@@ -529,7 +529,7 @@ MonMailAction:
 	jr nc, .BagIsFull
 	call GetPartyItemLocation
 	ld [hl], $0
-	call GetCurNick
+	call GetCurNickname
 	ld hl, .MailDetachedText
 	call MenuTextboxBackup
 	jr .done
@@ -1118,7 +1118,7 @@ SetUpMoveScreenBG:
 	ld [wMonType], a
 	ld hl, wPartyMonNicknames
 	ld a, [wCurPartyMon]
-	call GetNick
+	call GetNickname
 	hlcoord 5, 1
 	call PlaceString
 	push bc
diff --git a/engine/pokemon/mon_stats.asm b/engine/pokemon/mon_stats.asm
index c8fbff28..c76d20db 100644
--- a/engine/pokemon/mon_stats.asm
+++ b/engine/pokemon/mon_stats.asm
@@ -330,7 +330,7 @@ Unused_PlaceEnemyHPLevel:
 	push hl
 	ld hl, wPartyMonNicknames
 	ld a, [wCurPartyMon]
-	call GetNick
+	call GetNickname
 	pop hl
 	call PlaceString
 	call CopyMonToTempMon
diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm
index 605ac07c..f843e46a 100644
--- a/engine/pokemon/move_mon.asm
+++ b/engine/pokemon/move_mon.asm
@@ -34,11 +34,11 @@ TryAddMonToParty:
 	ld a, -1
 	ld [de], a
 	; Now let's load the OT name.
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 	ld a, [wMonType]
 	and $f
 	jr z, .loadOTname
-	ld hl, wOTPartyMonOT
+	ld hl, wOTPartyMonOTs
 
 .loadOTname
 	ldh a, [hMoveMon] ; Restore index from backup
@@ -419,13 +419,13 @@ AddTempmonToParty:
 	ld hl, wTempMonSpecies
 	call CopyBytes
 
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 	ld a, [wPartyCount]
 	dec a
 	call SkipNames
 	ld d, h
 	ld e, l
-	ld hl, wOTPartyMonOT
+	ld hl, wOTPartyMonOTs
 	ld a, [wCurPartyMon]
 	call SkipNames
 	ld bc, NAME_LENGTH
@@ -565,10 +565,10 @@ SendGetMonIntoFromBox:
 	ld de, wBreedMon1OT
 	jr z, .okay5
 	dec a
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 	ld a, [wPartyCount]
 	jr nz, .okay6
-	ld hl, sBoxMonOT
+	ld hl, sBoxMonOTs
 	ld a, [sBoxCount]
 
 .okay6
@@ -578,14 +578,14 @@ SendGetMonIntoFromBox:
 	ld e, l
 
 .okay5
-	ld hl, sBoxMonOT
+	ld hl, sBoxMonOTs
 	ld a, [wPokemonWithdrawDepositParameter]
 	and a
 	jr z, .okay7
 	ld hl, wBreedMon1OT
 	cp DAY_CARE_WITHDRAW
 	jr z, .okay8
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 
 .okay7
 	ld a, [wCurPartyMon]
@@ -596,7 +596,7 @@ SendGetMonIntoFromBox:
 	call CopyBytes
 	ld a, [wPokemonWithdrawDepositParameter]
 	cp DAY_CARE_DEPOSIT
-	ld de, wBreedMon1Nick
+	ld de, wBreedMon1Nickname
 	jr z, .okay9
 	dec a
 	ld hl, wPartyMonNicknames
@@ -616,7 +616,7 @@ SendGetMonIntoFromBox:
 	ld a, [wPokemonWithdrawDepositParameter]
 	and a
 	jr z, .okay11
-	ld hl, wBreedMon1Nick
+	ld hl, wBreedMon1Nickname
 	cp DAY_CARE_WITHDRAW
 	jr z, .okay12
 	ld hl, wPartyMonNicknames
@@ -819,10 +819,10 @@ RetrieveBreedmon:
 	ld a, [wPokemonWithdrawDepositParameter]
 	and a
 	ld a, [wBreedMon1Species]
-	ld de, wBreedMon1Nick
+	ld de, wBreedMon1Nickname
 	jr z, .okay
 	ld a, [wBreedMon2Species]
-	ld de, wBreedMon2Nick
+	ld de, wBreedMon2Nickname
 
 .okay
 	ld [hli], a
@@ -839,7 +839,7 @@ RetrieveBreedmon:
 	pop de
 	call CopyBytes
 	push hl
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 	ld a, [wPartyCount]
 	dec a
 	call SkipNames
@@ -909,14 +909,14 @@ GetLastPartyMon:
 	ret
 
 DepositMonWithDayCareMan:
-	ld de, wBreedMon1Nick
+	ld de, wBreedMon1Nickname
 	call DepositBreedmon
 	xor a ; REMOVE_PARTY
 	ld [wPokemonWithdrawDepositParameter], a
 	jp RemoveMonFromPartyOrBox
 
 DepositMonWithDayCareLady:
-	ld de, wBreedMon2Nick
+	ld de, wBreedMon2Nickname
 	call DepositBreedmon
 	xor a ; REMOVE_PARTY
 	ld [wPokemonWithdrawDepositParameter], a
@@ -928,7 +928,7 @@ DepositBreedmon:
 	call SkipNames
 	call CopyBytes
 	ld a, [wCurPartyMon]
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 	call SkipNames
 	call CopyBytes
 	ld a, [wCurPartyMon]
@@ -967,7 +967,7 @@ SendMonIntoBox:
 	call ShiftBoxMon
 
 	ld hl, wPlayerName
-	ld de, sBoxMonOT
+	ld de, sBoxMonOTs
 	ld bc, NAME_LENGTH
 	call CopyBytes
 
@@ -1071,7 +1071,7 @@ SendMonIntoBox:
 	ret
 
 ShiftBoxMon:
-	ld hl, sBoxMonOT
+	ld hl, sBoxMonOTs
 	ld bc, NAME_LENGTH
 	call .shift
 
@@ -1246,12 +1246,12 @@ RemoveMonFromPartyOrBox:
 	ld [hli], a
 	inc a
 	jr nz, .loop
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 	ld d, PARTY_LENGTH - 1
 	ld a, [wPokemonWithdrawDepositParameter]
 	and a
 	jr z, .party
-	ld hl, sBoxMonOT
+	ld hl, sBoxMonOTs
 	ld d, MONS_PER_BOX - 1
 
 .party
@@ -1296,13 +1296,13 @@ RemoveMonFromPartyOrBox:
 	jr z, .party5
 	ld bc, BOXMON_STRUCT_LENGTH
 	add hl, bc
-	ld bc, sBoxMonOT
+	ld bc, sBoxMonOTs
 	jr .copy
 
 .party5
 	ld bc, PARTYMON_STRUCT_LENGTH
 	add hl, bc
-	ld bc, wPartyMonOT
+	ld bc, wPartyMonOTs
 .copy
 	call CopyDataUntil
 	; Shift the nicknames
@@ -1718,7 +1718,7 @@ GivePoke::
 
 	push hl
 	ld a, [wCurPartyMon]
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 	call SkipNames
 	ld d, h
 	ld e, l
@@ -1735,9 +1735,9 @@ GivePoke::
 	jr .skip_nickname
 
 .send_to_box
-	ld a, BANK(sBoxMonOT)
+	ld a, BANK(sBoxMonOTs)
 	call OpenSRAM
-	ld de, sBoxMonOT
+	ld de, sBoxMonOTs
 	ld bc, MON_NAME_LENGTH
 	ld a, [wScriptBank]
 	call FarCopyBytes
diff --git a/engine/pokemon/move_mon_wo_mail.asm b/engine/pokemon/move_mon_wo_mail.asm
index 79f70d05..b8e492f1 100644
--- a/engine/pokemon/move_mon_wo_mail.asm
+++ b/engine/pokemon/move_mon_wo_mail.asm
@@ -8,12 +8,12 @@ InsertPokemonIntoBox:
 	ld [wNextBoxOrPartyIndex], a
 	ld hl, sBoxMonNicknames
 	ld bc, MON_NAME_LENGTH
-	ld de, wBufferMonNick
+	ld de, wBufferMonNickname
 	call InsertDataIntoBoxOrParty
 	ld a, [sBoxCount]
 	dec a
 	ld [wNextBoxOrPartyIndex], a
-	ld hl, sBoxMonOT
+	ld hl, sBoxMonOTs
 	ld bc, NAME_LENGTH
 	ld de, wBufferMonOT
 	call InsertDataIntoBoxOrParty
@@ -45,12 +45,12 @@ InsertPokemonIntoParty:
 	ld [wNextBoxOrPartyIndex], a
 	ld hl, wPartyMonNicknames
 	ld bc, MON_NAME_LENGTH
-	ld de, wBufferMonNick
+	ld de, wBufferMonNickname
 	call InsertDataIntoBoxOrParty
 	ld a, [wPartyCount]
 	dec a
 	ld [wNextBoxOrPartyIndex], a
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 	ld bc, NAME_LENGTH
 	ld de, wBufferMonOT
 	call InsertDataIntoBoxOrParty
diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm
index 60fb0dc7..f435fb7b 100644
--- a/engine/pokemon/party_menu.asm
+++ b/engine/pokemon/party_menu.asm
@@ -90,7 +90,7 @@ PlacePartyNicknames:
 	push hl
 	ld hl, wPartyMonNicknames
 	ld a, b
-	call GetNick
+	call GetNickname
 	pop hl
 	call PlaceString
 	pop hl
@@ -695,7 +695,7 @@ YouHaveNoPKMNString:
 PrintPartyMenuActionText:
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMonNicknames
-	call GetNick
+	call GetNickname
 	ld a, [wPartyMenuActionText]
 	and $f
 	ld hl, .MenuActionTexts
diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm
index d35d0d75..4aa4db52 100644
--- a/engine/pokemon/stats_screen.asm
+++ b/engine/pokemon/stats_screen.asm
@@ -338,7 +338,7 @@ StatsScreen_InitUpperHalf:
 	dw wPartyMonNicknames
 	dw wOTPartyMonNicknames
 	dw sBoxMonNicknames
-	dw wBufferMonNick
+	dw wBufferMonNickname
 
 LoadPinkPage:
 	push bc
@@ -670,7 +670,7 @@ LoadBluePage:
 ; OT name
 	ld a, [wMonType]
 	cp BOXMON
-	ld a, BANK(sBoxMonOT)
+	ld a, BANK(sBoxMonOTs)
 	call z, OpenSRAM
 	ld de, wStringBuffer1
 	push de
@@ -708,9 +708,9 @@ LoadBluePage:
 	ret
 
 .OTNamePointers:
-	dw wPartyMonOT
-	dw wOTPartyMonOT
-	dw sBoxMonOT
+	dw wPartyMonOTs
+	dw wOTPartyMonOTs
+	dw sBoxMonOTs
 	dw wBufferMonOT
 
 IDNoString:
diff --git a/engine/pokemon/switchpartymons.asm b/engine/pokemon/switchpartymons.asm
index 1ec3cf69..b6c152d7 100644
--- a/engine/pokemon/switchpartymons.asm
+++ b/engine/pokemon/switchpartymons.asm
@@ -81,12 +81,12 @@ _SwitchPartyMons:
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call CopyBytes
 	ld a, [wSwitchMonTo]
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 	call SkipNames
 	push hl
 	call .CopyNameToSwitchMonBuffer
 	ld a, [wSwitchMonFrom]
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 	call SkipNames
 	pop de
 	push hl