Consistent labels for each nickname in RAM

constants/npc_trade_constants.asm

@@ -1,15 +1,15 @@
 ; npctrade struct members (see data/events/npc_trades.asm)
 rsreset
-NPCTRADE_DIALOG  rb
-NPCTRADE_GIVEMON rb
-NPCTRADE_GETMON  rb
-NPCTRADE_NICK    rb MON_NAME_LENGTH
-NPCTRADE_DVS     rw
-NPCTRADE_ITEM    rb
-NPCTRADE_OT_ID   rw
-NPCTRADE_OT_NAME rb NAME_LENGTH
-NPCTRADE_GENDER  rb
-NPCTRADE_PADDING rb
+NPCTRADE_DIALOG   rb
+NPCTRADE_GIVEMON  rb
+NPCTRADE_GETMON   rb
+NPCTRADE_NICKNAME rb MON_NAME_LENGTH
+NPCTRADE_DVS      rw
+NPCTRADE_ITEM     rb
+NPCTRADE_OT_ID    rw
+NPCTRADE_OT_NAME  rb NAME_LENGTH
+NPCTRADE_GENDER   rb
+                  rb_skip
 NPCTRADE_STRUCT_LENGTH EQU _RS
 
 ; NPCTrades indexes (see data/events/npc_trades.asm)

data/text/battle.asm

@@ -9,28 +9,28 @@ BattleText_PlayerPickedUpPayDayMoney:
 
 WildPokemonAppearedText:
 	text "Wild @"
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text_start
 	line "appeared!"
 	prompt
 
 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
 
 WildCelebiAppearedText:
 	text "Wild @"
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text_start
 	line "appeared!"
 	prompt
@@ -42,14 +42,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
@@ -161,7 +161,7 @@ BattleText_TheSandstormSubsided:
 
 BattleText_EnemyMonFainted:
 	text "Enemy @"
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text_start
 	line "fainted!"
 	prompt
@@ -206,7 +206,7 @@ UnusedRivalLossText: ; unreferenced
 	prompt
 
 BattleText_MonFainted:
-	text_ram wBattleMonNick
+	text_ram wBattleMonNickname
 	text_start
 	line "fainted!"
 	prompt
@@ -230,7 +230,7 @@ BattleText_EnemyIsAboutToUseWillPlayerChangeMon:
 	text "<ENEMY>"
 	line "is about to use"
 	cont "@"
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text "."
 
 	para "Will <PLAYER>"
@@ -241,7 +241,7 @@ BattleText_EnemySentOut:
 	text "<ENEMY>"
 	line "sent out"
 	cont "@"
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text "!"
 	done
 
@@ -308,13 +308,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
@@ -330,7 +330,7 @@ BattleText_TheMoveIsDisabled:
 	prompt
 
 BattleText_MonHasNoMovesLeft:
-	text_ram wBattleMonNick
+	text_ram wBattleMonNickname
 	text_start
 	line "has no moves left!"
 	done
@@ -353,14 +353,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
@@ -516,37 +516,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

data/text/common_1.asm

@@ -1106,7 +1106,7 @@ _EnemyWithdrewText::
 	text "<ENEMY>"
 	line "withdrew"
 	cont "@"
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text "!"
 	prompt
 
@@ -1116,7 +1116,7 @@ _EnemyUsedOnText::
 	text_ram wMonOrItemNameBuffer
 	text_start
 	cont "on @"
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text "!"
 	prompt
 

data/text/common_2.asm

@@ -133,12 +133,12 @@ _YourFoesWeakGetmMonText::
 	text_end
 
 _BattleMonNicknameText::
-	text_ram wBattleMonNick
+	text_ram wBattleMonNickname
 	text "!"
 	done
 
 _BattleMonNickCommaText::
-	text_ram wBattleMonNick
+	text_ram wBattleMonNickname
 	text ",@"
 	text_end
 
@@ -807,15 +807,15 @@ _BreedAskNicknameText::
 
 _LeftWithDayCareLadyText::
 	text "It's @"
-	text_ram wBreedMon2Nick
+	text_ram wBreedMon2Nickname
 	text_start
 	line "that was left with"
 	cont "the DAY-CARE LADY."
 	done
 
 _LeftWithDayCareManText::
 	text "It's @"
-	text_ram wBreedMon1Nick
+	text_ram wBreedMon1Nickname
 	text_start
 	line "that was left with"
 	cont "the DAY-CARE MAN."

data/text/common_3.asm

@@ -72,7 +72,7 @@ _LinkAbnormalMonText::
 
 _LinkAskTradeForText::
 	text "Trade @"
-	text_ram wBufferTrademonNick
+	text_ram wBufferTrademonNickname
 	text_start
 	line "for @"
 	text_ram wStringBuffer1
@@ -322,15 +322,15 @@ _SeerTradeText::
 	text_ram wSeerNickname
 	text_start
 	line "came from @"
-	text_ram wSeerOTName
+	text_ram wSeerOT
 	text_start
 	cont "in a trade?"
 
 	para "@"
 	text_ram wSeerCaughtLocation
 	text_start
 	line "was where @"
-	text_ram wSeerOTName
+	text_ram wSeerOT
 	text_start
 	cont "met @"
 	text_ram wSeerNickname
@@ -1216,7 +1216,7 @@ _BallSoCloseText::
 
 Text_BallCaught::
 	text "Gotcha! @"
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text_start
 	line "was caught!@"
 	sound_caught_mon
@@ -1237,7 +1237,7 @@ _BallSentToPCText::
 	prompt
 
 _NewDexDataText::
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text "'s data"
 	line "was newly added to"
 	cont "the #DEX.@"

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

docs/bugs_and_glitches.md

@@ -566,7 +566,7 @@ This bug affects Attract, Curse, Foresight, Mean Look, Mimic, Nightmare, Spider
  .got_mon
  	ld a, [wCurBeatUpPartyMon]
  	ld hl, wPartyMonNicknames
- 	call GetNick
+ 	call GetNickname
  	ld a, MON_HP
  	call GetBeatupMonLocation
  	ld a, [hli]

docs/text_commands.md

@@ -110,13 +110,13 @@ Play `SFX_SLOT_MACHINE_START`.
 
 Write text from one of the following addresses (listed in [data/text_buffers.asm](https://github.com/pret/pokecrystal/blob/master/data/text_buffers.asm)):
 
-0. `StringBuffer3`
-1. `StringBuffer4`
-2. `StringBuffer5`
-3. `StringBuffer2`
-4. `StringBuffer1`
-5. `EnemyMonNick`
-6. `BattleMonNick`
+0. `wStringBuffer3`
+1. `wStringBuffer4`
+2. `wStringBuffer5`
+3. `wStringBuffer2`
+4. `wStringBuffer1`
+5. `wEnemyMonNickname`
+6. `wBattleMonNickname`
 
 
 ## `$15`: `text_today`