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,7 +9,7 @@ BattleText_PlayerPickedUpPayDayMoney:
 
 WildPokemonAppearedText:
 	text "Wild @"
-	text_ram wEnemyMonNick
+	text_ram wEnemyMonNickname
 	text_start
 	line "appeared!"
 	prompt
@@ -17,20 +17,20 @@ 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
 
 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,7 +807,7 @@ _BreedAskNicknameText::
 
 _LeftWithDayCareLadyText::
 	text "It's @"
-	text_ram wBreedMon2Nick
+	text_ram wBreedMon2Nickname
 	text_start
 	line "that was left with"
 	cont "the DAY-CARE LADY."
@@ -815,7 +815,7 @@ _LeftWithDayCareLadyText::
 
 _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,7 +322,7 @@ _SeerTradeText::
 	text_ram wSeerNickname
 	text_start
 	line "came from @"
-	text_ram wSeerOTName
+	text_ram wSeerOT
 	text_start
 	cont "in a trade?"
 
@@ -330,7 +330,7 @@ _SeerTradeText::
 	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`

engine/battle/core.asm

@@ -3885,7 +3885,7 @@ InitBattleMon:
 	ld hl, wPartyMonNicknames
 	ld a, [wCurBattleMon]
 	call SkipNames
-	ld de, wBattleMonNick
+	ld de, wBattleMonNickname
 	ld bc, MON_NAME_LENGTH
 	call CopyBytes
 	ld hl, wBattleMonAttack
@@ -3965,7 +3965,7 @@ InitEnemyMon:
 	ld hl, wOTPartyMonNicknames
 	ld a, [wCurPartyMon]
 	call SkipNames
-	ld de, wEnemyMonNick
+	ld de, wEnemyMonNickname
 	ld bc, MON_NAME_LENGTH
 	call CopyBytes
 	ld hl, wEnemyMonAttack
@@ -4642,7 +4642,7 @@ CheckDanger:
 	ret
 
 PrintPlayerHUD:
-	ld de, wBattleMonNick
+	ld de, wBattleMonNickname
 	hlcoord 10, 7
 	call Battle_DummyFunction
 	call PlaceString
@@ -4728,7 +4728,7 @@ DrawEnemyHUD:
 	ld [wCurSpecies], a
 	ld [wCurPartySpecies], a
 	call GetBaseData
-	ld de, wEnemyMonNick
+	ld de, wEnemyMonNickname
 	hlcoord 1, 0
 	call Battle_DummyFunction
 	call PlaceString
@@ -6394,7 +6394,7 @@ LoadEnemyMon:
 
 ; Update enemy nick
 	ld hl, wStringBuffer1
-	ld de, wEnemyMonNick
+	ld de, wEnemyMonNickname
 	ld bc, MON_NAME_LENGTH
 	call CopyBytes
 
@@ -7112,7 +7112,7 @@ GiveExperiencePoints:
 	ld [wStringBuffer2], a
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMonNicknames
-	call GetNick
+	call GetNickname
 	ld hl, Text_MonGainedExpPoint
 	call BattleTextbox
 	ld a, [wStringBuffer2 + 1]
@@ -7523,7 +7523,7 @@ AnimateExpBar:
 	ld c, $40
 	call .LoopBarAnimation
 	call PrintPlayerHUD
-	ld hl, wBattleMonNick
+	ld hl, wBattleMonNickname
 	ld de, wStringBuffer1
 	ld bc, MON_NAME_LENGTH
 	call CopyBytes

engine/battle/move_effects/beat_up.asm

@@ -28,7 +28,7 @@ BattleCommand_BeatUp:
 .got_mon
 	ld a, [wCurBeatUpPartyMon]
 	ld hl, wPartyMonNicknames
-	call GetNick
+	call GetNickname
 	ld a, MON_HP
 	call GetBeatupMonLocation
 	ld a, [hli]

engine/battle/read_trainer_party.asm

@@ -14,7 +14,7 @@ ReadTrainerParty:
 	ld [hl], a
 
 	ld hl, wOTPartyMons
-	ld bc, wOTPartyMonsEnd - wOTPartyMons
+	ld bc, PARTYMON_STRUCT_LENGTH * PARTY_LENGTH
 	xor a
 	call ByteFill
 

engine/events/battle_tower/battle_tower.asm

@@ -1258,7 +1258,7 @@ BattleTowerAction_EggTicket: ; BattleTowerAction $0e
 	cp EGG
 	jr nz, .not_egg
 	push hl
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 	ld de, NAME_LENGTH_JAPANESE
 	ld a, b
 	and a

engine/events/bug_contest/display_stats.asm

@@ -48,7 +48,7 @@ DisplayCaughtContestMonStats:
 	ld [wTempMonLevel], a
 	call PrintLevel
 
-	ld de, wEnemyMonNick
+	ld de, wEnemyMonNickname
 	hlcoord 1, 8
 	call PlaceString
 

engine/events/daycare.asm

@@ -40,7 +40,7 @@ DayCareMan:
 
 .AskWithdrawMon:
 	farcall GetBreedMon1LevelGrowth
-	ld hl, wBreedMon1Nick
+	ld hl, wBreedMon1Nickname
 	call GetPriceToRetrieveBreedmon
 	call DayCare_AskWithdrawBreedMon
 	jr c, .print_text
@@ -78,7 +78,7 @@ DayCareLady:
 
 .AskWithdrawMon:
 	farcall GetBreedMon2LevelGrowth
-	ld hl, wBreedMon2Nick
+	ld hl, wBreedMon2Nickname
 	call GetPriceToRetrieveBreedmon
 	call DayCare_AskWithdrawBreedMon
 	jr c, .print_text
@@ -137,7 +137,7 @@ DayCareAskDepositPokemon:
 	jr c, .HoldingMail
 	ld hl, wPartyMonNicknames
 	ld a, [wCurPartyMon]
-	call GetNick
+	call GetNickname
 	and a
 	ret
 
@@ -467,13 +467,13 @@ DayCare_GiveEgg:
 	ld hl, wPartyMonNicknames
 	ld bc, MON_NAME_LENGTH
 	call DayCare_GetCurrentPartyMember
-	ld hl, wEggNick
+	ld hl, wEggMonNickname
 	call CopyBytes
 
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 	ld bc, NAME_LENGTH
 	call DayCare_GetCurrentPartyMember
-	ld hl, wEggOT
+	ld hl, wEggMonOT
 	call CopyBytes
 
 	ld hl, wPartyMon1
@@ -550,10 +550,10 @@ DayCare_InitBreeding:
 	ld hl, wEggMon
 	ld bc, BOXMON_STRUCT_LENGTH
 	call ByteFill
-	ld hl, wEggNick
+	ld hl, wEggMonNickname
 	ld bc, MON_NAME_LENGTH
 	call ByteFill
-	ld hl, wEggOT
+	ld hl, wEggMonOT
 	ld bc, NAME_LENGTH
 	call ByteFill
 	ld a, [wBreedMon1DVs]
@@ -606,11 +606,11 @@ DayCare_InitBreeding:
 	ld [wEggMonSpecies], a
 
 	call GetBaseData
-	ld hl, wEggNick
+	ld hl, wEggMonNickname
 	ld de, .String_EGG
 	call CopyName2
 	ld hl, wPlayerName
-	ld de, wEggOT
+	ld de, wEggMonOT
 	ld bc, NAME_LENGTH
 	call CopyBytes
 	xor a

engine/events/haircut.asm

@@ -33,7 +33,7 @@ HaircutOrGrooming:
 	cp EGG
 	jr z, .egg
 	push hl
-	call GetCurNick
+	call GetCurNickname
 	call CopyPokemonName_Buffer1_Buffer3
 	pop hl
 	call Random

engine/events/magikarp.asm

@@ -49,7 +49,7 @@ CheckMagikarpLength:
 	ld [de], a
 	inc de
 	ld a, [wCurPartyMon]
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 	call SkipNames
 	call CopyBytes
 	ld a, MAGIKARPLENGTH_BEAT_RECORD

engine/events/move_tutor.asm

@@ -60,7 +60,7 @@ CheckCanLearnMoveTutorMove:
 	push bc
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMonNicknames
-	call GetNick
+	call GetNickname
 	pop bc
 
 	ld a, c

engine/events/name_rater.asm

@@ -14,7 +14,7 @@ _NameRater:
 	cp EGG
 	jr z, .egg
 ; ... or a Pokemon you got from a trade.
-	call GetCurNick
+	call GetCurNickname
 	call CheckIfMonIsYourOT
 	jr c, .traded
 ; This name is good, but we can do better.  How about it?
@@ -57,7 +57,7 @@ _NameRater:
 
 .samename
 	push hl
-	call GetCurNick
+	call GetCurNickname
 	ld hl, NameRaterNamedText
 	call PrintText
 	pop hl
@@ -80,7 +80,7 @@ _NameRater:
 
 CheckIfMonIsYourOT:
 ; Checks to see if the partymon loaded in [wCurPartyMon] has the different OT as you.  Returns carry if not.
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 	ld bc, NAME_LENGTH
 	ld a, [wCurPartyMon]
 	call AddNTimes
@@ -138,10 +138,10 @@ CompareNewToOld:
 	ld a, [wCurPartyMon]
 	call AddNTimes
 	push hl
-	call GetNicknameLength
+	call GetNicknamenameLength
 	ld b, c
 	ld hl, wStringBuffer2
-	call GetNicknameLength
+	call GetNicknamenameLength
 	pop hl
 	ld a, c
 	cp b
@@ -165,7 +165,7 @@ CompareNewToOld:
 	scf
 	ret
 
-GetNicknameLength:
+GetNicknamenameLength:
 ; Gets the length of the name starting at hl and returns it in c.
 	ld c, 0
 .loop

engine/events/npc_trade.asm

@@ -132,7 +132,7 @@ DoNPCTrade:
 	call GetTradeMonName
 	call CopyTradeName
 
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 	ld bc, NAME_LENGTH
 	call Trade_GetAttributeOfCurrentPartymon
 	ld de, wPlayerTrademonOTName
@@ -196,7 +196,7 @@ DoNPCTrade:
 .incomplete
 	farcall SetGiftPartyMonCaughtData
 
-	ld e, NPCTRADE_NICK
+	ld e, NPCTRADE_NICKNAME
 	call GetTradeAttr
 	ld de, wOTTrademonNickname
 	call CopyTradeName
@@ -216,7 +216,7 @@ DoNPCTrade:
 	ld de, wOTTrademonSenderName
 	call CopyTradeName
 
-	ld hl, wPartyMonOT
+	ld hl, wPartyMonOTs
 	ld bc, NAME_LENGTH
 	call Trade_GetAttributeOfLastPartymon
 	ld hl, wOTTrademonOTName

engine/events/odd_egg.asm

@@ -42,8 +42,8 @@ _GiveOddEgg:
 	ld a, NICKNAMED_MON_STRUCT_LENGTH
 	call AddNTimes
 
-	; Writes to wOddEgg, wOddEggName, and wOddEggOTName,
-	; even though OddEggs does not have data for wOddEggOTName
+	; Writes to wOddEgg, wOddEggName, and wOddEggOT,
+	; even though OddEggs does not have data for wOddEggOT
 	ld de, wOddEgg
 	ld bc, NICKNAMED_MON_STRUCT_LENGTH + NAME_LENGTH
 	call CopyBytes
@@ -78,11 +78,11 @@ _GiveOddEgg:
 	ld bc, MON_NAME_LENGTH
 	call CopyBytes
 
-	; load pointer to wTempOddEggNickname in wMobileMonOTNamePointer
+	; load pointer to wTempOddEggNickname in wMobileMonOTPointer
 	ld a, LOW(wTempOddEggNickname)
-	ld [wMobileMonOTNamePointer], a
+	ld [wMobileMonOTPointer], a
 	ld a, HIGH(wTempOddEggNickname)
-	ld [wMobileMonOTNamePointer + 1], a
+	ld [wMobileMonOTPointer + 1], a
 	; load pointer to wOddEggName in wMobileMonNicknamePointer
 	ld a, LOW(wOddEggName)
 	ld [wMobileMonNicknamePointer], a