Consistent labels for each nickname in RAM

16 files changed, 65 insertions, 65 deletions

diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm
index 8c37d3b8f..e9a0bc82f 100644
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -1709,7 +1709,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
@@ -1727,7 +1727,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
@@ -1753,7 +1753,7 @@ BillsPC_CopyMon:
 	call CopyNicknameToTemp
 	pop hl
 	push hl
-	ld bc, sBoxMonOT - sBox
+	ld bc, sBoxMonOTs - sBox
 	add hl, bc
 	call CopyOTNameToTemp
 	pop hl
@@ -1772,7 +1772,7 @@ DepositPokemon:
 	ld [wCurPartyMon], a
 	ld hl, wPartyMonNicknames
 	ld a, [wCurPartyMon]
-	call GetNick
+	call GetNickname
 	ld a, PC_DEPOSIT
 	ld [wPokemonWithdrawDepositParameter], a
 	predef SendGetMonIntoFromBox
@@ -1826,7 +1826,7 @@ TryWithdrawPokemon:
 	call OpenSRAM
 	ld a, [wCurPartyMon]
 	ld hl, sBoxMonNicknames
-	call GetNick
+	call GetNickname
 	call CloseSRAM
 	xor a
 	ld [wPokemonWithdrawDepositParameter], a
@@ -2051,7 +2051,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
@@ -2084,7 +2084,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
@@ -2115,7 +2115,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 bcf5322e2..cda397179 100644
--- a/engine/pokemon/breeding.asm
+++ b/engine/pokemon/breeding.asm
@@ -303,7 +303,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
@@ -870,7 +870,7 @@ DayCareMon1:
 	bit DAYCARELADY_HAS_MON_F, a
 	jr z, DayCareMonCursor
 	call PromptButton
-	ld hl, wBreedMon2Nick
+	ld hl, wBreedMon2Nickname
 	call DayCareMonCompatibilityText
 	jp PrintText
 
@@ -883,7 +883,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_data.asm b/engine/pokemon/caught_data.asm
index bb115a841..4589eacdf 100644
--- a/engine/pokemon/caught_data.asm
+++ b/engine/pokemon/caught_data.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/correct_party_errors.asm b/engine/pokemon/correct_party_errors.asm
index cc3901096..c10be0910 100644
--- a/engine/pokemon/correct_party_errors.asm
+++ b/engine/pokemon/correct_party_errors.asm
@@ -137,7 +137,7 @@ CorrectPartyErrors: ; unreferenced
 	dec b
 	jr nz, .loop3
 
-	ld de, wPartyMonOT
+	ld de, wPartyMonOTs
 	ld a, [wPartyCount]
 	ld b, a
 	ld c, 0
diff --git a/engine/pokemon/european_mail.asm b/engine/pokemon/european_mail.asm
index eb9b7d5d9..2ba5e6c97 100644
--- a/engine/pokemon/european_mail.asm
+++ b/engine/pokemon/european_mail.asm
@@ -5,7 +5,7 @@ IsMailEuropean:
 ; return 4 if Spanish
 ; return 0 if none of the above
 	ld c, $0
-	ld hl, sPartyMon1MailAuthorNationality - sPartyMon1Mail
+	ld hl, sPartyMon1MailNationality - sPartyMon1Mail
 	add hl, de
 	ld a, [hli]
 	cp "E"
diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm
index 839e2c167..0b2cc15bb 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 2c597c7b6..c7728249e 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 e9cc15517..e70f0ec53 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 14db39531..2607cdf58 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
@@ -1119,7 +1119,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 caded2875..78f963ebd 100644
--- a/engine/pokemon/mon_stats.asm
+++ b/engine/pokemon/mon_stats.asm
@@ -343,7 +343,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 e51bbfe0a..e214b5b6a 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
@@ -1705,7 +1705,7 @@ GivePoke::
 
 	push hl
 	ld a, [wCurPartyMon]
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 	call SkipNames
 	ld d, h
 	ld e, l
@@ -1734,9 +1734,9 @@ GivePoke::
 	jr .skip_nickname
 
 .send_to_box
-	ld a, BANK(sBoxMonOT)
+	ld a, BANK(sBoxMonOTs)
 	call OpenSRAM
-	ld de, sBoxMonOT
+	ld de, sBoxMonOTs
 .loop
 	ld a, [wScriptBank]
 	call GetFarByte
diff --git a/engine/pokemon/move_mon_wo_mail.asm b/engine/pokemon/move_mon_wo_mail.asm
index 79f70d05e..b8e492f1e 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 91a403a6b..db3d7d25d 100644
--- a/engine/pokemon/party_menu.asm
+++ b/engine/pokemon/party_menu.asm
@@ -91,7 +91,7 @@ PlacePartyNicknames:
 	push hl
 	ld hl, wPartyMonNicknames
 	ld a, b
-	call GetNick
+	call GetNickname
 	pop hl
 	call PlaceString
 	pop hl
@@ -773,7 +773,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/search.asm b/engine/pokemon/search.asm
index b6da60605..522ed3493 100644
--- a/engine/pokemon/search.asm
+++ b/engine/pokemon/search.asm
@@ -58,7 +58,7 @@ CheckOwnMonAnywhere:
 	ld d, a
 	ld e, 0
 	ld hl, wPartyMon1Species
-	ld bc, wPartyMonOT
+	ld bc, wPartyMonOTs
 
 	; Run CheckOwnMon on each Pokémon in the party.
 .partymon
@@ -82,7 +82,7 @@ CheckOwnMonAnywhere:
 
 	ld d, a
 	ld hl, sBoxMon1Species
-	ld bc, sBoxMonOT
+	ld bc, sBoxMonOTs
 .openboxmon
 	call CheckOwnMon
 	jr nc, .loop
@@ -138,7 +138,7 @@ CheckOwnMonAnywhere:
 	ld e, l
 	pop hl
 	push de
-	ld de, sBoxMonOT - sBoxCount
+	ld de, sBoxMonOTs - sBoxCount
 	add hl, de
 	ld b, h
 	ld c, l
diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm
index 059732444..4c351ff91 100644
--- a/engine/pokemon/stats_screen.asm
+++ b/engine/pokemon/stats_screen.asm
@@ -430,7 +430,7 @@ StatsScreen_InitUpperHalf:
 	hlcoord 14, 0
 	call PrintLevel
 	ld hl, .NicknamePointers
-	call GetNicknamePointer
+	call GetNicknamenamePointer
 	call CopyNickname
 	hlcoord 8, 2
 	call PlaceString
@@ -481,7 +481,7 @@ StatsScreen_InitUpperHalf:
 	dw wPartyMonNicknames
 	dw wOTPartyMonNicknames
 	dw sBoxMonNicknames
-	dw wBufferMonNick
+	dw wBufferMonNickname
 
 StatsScreen_PlaceVerticalDivider: ; unreferenced
 ; The Japanese stats screen has a vertical divider.
@@ -789,7 +789,7 @@ LoadBluePage:
 	ld de, wTempMonID
 	call PrintNum
 	ld hl, .OTNamePointers
-	call GetNicknamePointer
+	call GetNicknamenamePointer
 	call CopyNickname
 	farcall CorrectNickErrors
 	hlcoord 2, 13
@@ -810,9 +810,9 @@ LoadBluePage:
 	ret
 
 .OTNamePointers:
-	dw wPartyMonOT
-	dw wOTPartyMonOT
-	dw sBoxMonOT
+	dw wPartyMonOTs
+	dw wOTPartyMonOTs
+	dw sBoxMonOTs
 	dw wBufferMonOT
 
 IDNoString:
@@ -1157,7 +1157,7 @@ CopyNickname:
 	pop de
 	ret
 
-GetNicknamePointer:
+GetNicknamenamePointer:
 	ld a, [wMonType]
 	add a
 	ld c, a
diff --git a/engine/pokemon/switchpartymons.asm b/engine/pokemon/switchpartymons.asm
index 1ec3cf698..b6c152d7e 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