Consistent labels for each nickname in RAM

5 files changed, 39 insertions, 39 deletions

diff --git a/data/text/battle.asm b/data/text/battle.asm
index a83095bc..ee7d7d24 100644
--- a/data/text/battle.asm
+++ b/data/text/battle.asm
@@ -9,7 +9,7 @@ BattleText_PlayerPickedUpPayDayMoney:
 
 WildPokemonAppearedText:
 	text "Wild @"
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text_start
 	line "appeared!"
 	prompt
@@ -17,13 +17,13 @@ WildPokemonAppearedText:
 HookedPokemonAttackedText:
 	text "The hooked"
 	line "@"
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text_start
 	cont "attacked!"
 	prompt
 
 PokemonFellFromTreeText:
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text " fell"
 	line "out of the tree!"
 	prompt
@@ -35,14 +35,14 @@ WantsToBattleText::
 
 BattleText_WildFled:
 	text "Wild @"
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text_start
 	line "fled!"
 	prompt
 
 BattleText_EnemyFled:
 	text "Enemy @"
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text_start
 	line "fled!"
 	prompt
@@ -154,7 +154,7 @@ BattleText_TheSandstormSubsided:
 
 BattleText_EnemyMonFainted:
 	text "Enemy @"
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text_start
 	line "fainted!"
 	prompt
@@ -199,7 +199,7 @@ UnusedRivalLossText: ; unreferenced
 	prompt
 
 BattleText_MonFainted:
-	text_ram wBattleMonNick
+	text_ram wBattleMonNickname
 	text_start
 	line "fainted!"
 	prompt
@@ -223,7 +223,7 @@ BattleText_EnemyIsAboutToUseWillPlayerChangeMon:
 	text "<ENEMY>"
 	line "is about to use"
 	cont "@"
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text "."
 
 	para "Will <PLAYER>"
@@ -234,7 +234,7 @@ BattleText_EnemySentOut:
 	text "<ENEMY>"
 	line "sent out"
 	cont "@"
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text "!"
 	done
 
@@ -301,13 +301,13 @@ BattleText_ItemsCantBeUsedHere:
 	prompt
 
 BattleText_MonIsAlreadyOut:
-	text_ram wBattleMonNick
+	text_ram wBattleMonNickname
 	text_start
 	line "is already out."
 	prompt
 
 BattleText_MonCantBeRecalled:
-	text_ram wBattleMonNick
+	text_ram wBattleMonNickname
 	text_start
 	line "can't be recalled!"
 	prompt
@@ -323,7 +323,7 @@ BattleText_TheMoveIsDisabled:
 	prompt
 
 BattleText_MonHasNoMovesLeft:
-	text_ram wBattleMonNick
+	text_ram wBattleMonNickname
 	text_start
 	line "has no moves left!"
 	done
@@ -344,14 +344,14 @@ BattleText_StringBuffer1GrewToLevel:
 
 BattleText_WildMonIsEating:
 	text "Wild @"
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text_start
 	line "is eating!"
 	prompt
 
 BattleText_WildMonIsAngry:
 	text "Wild @"
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text_start
 	line "is angry!"
 	prompt
@@ -502,37 +502,37 @@ DisabledMoveText:
 	prompt
 
 LoafingAroundText:
-	text_ram wBattleMonNick
+	text_ram wBattleMonNickname
 	text " is"
 	line "loafing around."
 	prompt
 
 BeganToNapText:
-	text_ram wBattleMonNick
+	text_ram wBattleMonNickname
 	text " began"
 	line "to nap!"
 	prompt
 
 WontObeyText:
-	text_ram wBattleMonNick
+	text_ram wBattleMonNickname
 	text " won't"
 	line "obey!"
 	prompt
 
 TurnedAwayText:
-	text_ram wBattleMonNick
+	text_ram wBattleMonNickname
 	text " turned"
 	line "away!"
 	prompt
 
 IgnoredOrdersText:
-	text_ram wBattleMonNick
+	text_ram wBattleMonNickname
 	text " ignored"
 	line "orders!"
 	prompt
 
 IgnoredSleepingText:
-	text_ram wBattleMonNick
+	text_ram wBattleMonNickname
 	text " ignored"
 	line "orders…sleeping!"
 	prompt
diff --git a/data/text/common_1.asm b/data/text/common_1.asm
index c27c465f..ddcdc889 100644
--- a/data/text/common_1.asm
+++ b/data/text/common_1.asm
@@ -157,7 +157,7 @@ _EnemyWithdrewText::
 	text "<ENEMY>"
 	line "withdrew"
 	cont "@"
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text "!"
 	prompt
 
@@ -167,7 +167,7 @@ _EnemyUsedOnText::
 	text_ram wMonOrItemNameBuffer
 	text_start
 	cont "on @"
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text "!"
 	prompt
 
@@ -1666,32 +1666,32 @@ _ExpPointsText::
 
 _GoMonText::
 	text "Go! @"
-	text_ram wBattleMonNick
+	text_ram wBattleMonNickname
 	text "!"
 	done
 
 _DoItMonText::
 	text "Do it! @"
-	text_ram wBattleMonNick
+	text_ram wBattleMonNickname
 	text "!"
 	done
 
 _GoForItMonText::
 	text "Go for it,"
 	line "@"
-	text_ram wBattleMonNick
+	text_ram wBattleMonNickname
 	text "!"
 	done
 
 _YourFoesWeakGetmMonText::
 	text "Your foe's weak!"
 	line "Get'm, @"
-	text_ram wBattleMonNick
+	text_ram wBattleMonNickname
 	text "!"
 	done
 
 _BattleMonNickCommaText::
-	text_ram wBattleMonNick
+	text_ram wBattleMonNickname
 	text ",@@"
 
 _ThatsEnoughComeBackText::
diff --git a/data/text/common_2.asm b/data/text/common_2.asm
index 52399ab9..720ff8ce 100644
--- a/data/text/common_2.asm
+++ b/data/text/common_2.asm
@@ -467,7 +467,7 @@ _BreedAskNicknameText::
 
 _LeftWithDayCareLadyText::
 	text "It's @"
-	text_ram wBreedMon2Nick
+	text_ram wBreedMon2Nickname
 	text_start
 	line "that was left with"
 	cont "the DAY-CARE LADY."
@@ -475,7 +475,7 @@ _LeftWithDayCareLadyText::
 
 _LeftWithDayCareManText::
 	text "It's @"
-	text_ram wBreedMon1Nick
+	text_ram wBreedMon1Nickname
 	text_start
 	line "that was left with"
 	cont "the DAY-CARE MAN."
@@ -1264,7 +1264,7 @@ _LinkAbnormalMonText::
 
 _LinkAskTradeForText::
 	text "Trade @"
-	text_ram wBufferTrademonNick
+	text_ram wBufferTrademonNickname
 	text_start
 	line "for @"
 	text_ram wStringBuffer1
diff --git a/data/text/common_3.asm b/data/text/common_3.asm
index cc3ee20c..79e1948b 100644
--- a/data/text/common_3.asm
+++ b/data/text/common_3.asm
@@ -259,7 +259,7 @@ _BallSoCloseText::
 
 Text_BallCaught::
 	text "Gotcha! @"
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text_start
 	line "was caught!@"
 	sound_caught_mon
@@ -278,7 +278,7 @@ _BallSentToPCText::
 	prompt
 
 _NewDexDataText::
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text "'s data"
 	line "was newly added to"
 	cont "the #DEX.@"
diff --git a/data/text_buffers.asm b/data/text_buffers.asm
index 7c28c11e..2f681004 100644
--- a/data/text_buffers.asm
+++ b/data/text_buffers.asm
@@ -1,9 +1,9 @@
 StringBufferPointers::
 ; entries correspond to arguments for text_buffer (TX_STRINGBUFFER)
-	dw wStringBuffer3 ; 0
-	dw wStringBuffer4 ; 1
-	dw wStringBuffer5 ; 2
-	dw wStringBuffer2 ; 3
-	dw wStringBuffer1 ; 4
-	dw wEnemyMonNick  ; 5
-	dw wBattleMonNick ; 6
+	dw wStringBuffer3     ; 0
+	dw wStringBuffer4     ; 1
+	dw wStringBuffer5     ; 2
+	dw wStringBuffer2     ; 3
+	dw wStringBuffer1     ; 4
+	dw wEnemyMonNickname  ; 5
+	dw wBattleMonNickname ; 6