Merge branch 'master' of https://github.com/pret/pokered

13 files changed, 36 insertions, 36 deletions

diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 48104833..882f3f8e 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2344,7 +2344,7 @@ UseBagItem:
 	ld a, [wcf91]
 	ld [wd11e], a
 	call GetItemName
-	call CopyStringToCF4B ; copy name
+	call CopyToStringBuffer
 	xor a
 	ld [wPseudoItemID], a
 	call UseItem
@@ -3506,7 +3506,7 @@ CheckPlayerStatusConditions:
 
 .HeldInPlaceCheck
 	ld a, [wEnemyBattleStatus1]
-	bit USING_TRAPPING_MOVE, a ; is enemy using a mult-turn move like wrap?
+	bit USING_TRAPPING_MOVE, a ; is enemy using a multi-turn move like wrap?
 	jp z, .FlinchedCheck
 	ld hl, CantMoveText
 	call PrintText
@@ -3713,7 +3713,7 @@ CheckPlayerStatusConditions:
 	ld a, RAGE
 	ld [wd11e], a
 	call GetMoveName
-	call CopyStringToCF4B
+	call CopyToStringBuffer
 	xor a
 	ld [wPlayerMoveEffect], a
 	ld hl, PlayerCanExecuteMove
@@ -3915,7 +3915,7 @@ PrintMoveName:
 	ret
 
 _PrintMoveName:
-	text_far _CF4BText
+	text_far _MoveNameText
 	text_asm
 	ld hl, ExclamationPointPointerTable
 	ld a, [wd11e] ; exclamation point num
@@ -5277,7 +5277,7 @@ ReloadMoveData:
 	call IncrementMovePP
 ; the follow two function calls are used to reload the move name
 	call GetMoveName
-	call CopyStringToCF4B
+	call CopyToStringBuffer
 	ld a, $01
 	and a
 	ret
@@ -5789,7 +5789,7 @@ EnemyCanExecuteChargingMove:
 	ld [wNameListType], a
 	call GetName
 	ld de, wcd6d
-	call CopyStringToCF4B
+	call CopyToStringBuffer
 EnemyCanExecuteMove:
 	xor a
 	ld [wMonIsDisobedient], a
@@ -6226,7 +6226,7 @@ CheckEnemyStatusConditions:
 	ld a, RAGE
 	ld [wd11e], a
 	call GetMoveName
-	call CopyStringToCF4B
+	call CopyToStringBuffer
 	xor a
 	ld [wEnemyMoveEffect], a
 	ld hl, EnemyCanExecuteMove
@@ -6268,7 +6268,7 @@ GetCurrentMove:
 	ld [wNameListType], a
 	call GetName
 	ld de, wcd6d
-	jp CopyStringToCF4B
+	jp CopyToStringBuffer
 
 LoadEnemyMonData:
 	ld a, [wLinkState]
diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm
index 283a794b..959f7eaf 100644
--- a/engine/battle/effects.asm
+++ b/engine/battle/effects.asm
@@ -787,7 +787,7 @@ PrintStatText:
 	jr z, .findStatName_outer
 	jr .findStatName_inner
 .foundStatName
-	ld de, wcf4b
+	ld de, wStringBuffer
 	ld bc, $a
 	jp CopyData
 
diff --git a/engine/events/cinnabar_lab.asm b/engine/events/cinnabar_lab.asm
index bccc95d1..7cbb2cd5 100644
--- a/engine/events/cinnabar_lab.asm
+++ b/engine/events/cinnabar_lab.asm
@@ -116,7 +116,7 @@ LoadFossilItemAndMonName::
 	ld a, [wFossilMon]
 	ld [wd11e], a
 	call GetMonName
-	call CopyStringToCF4B
+	call CopyToStringBuffer
 	ld a, [wFossilItem]
 	ld [wd11e], a
 	call GetItemName
diff --git a/engine/events/give_pokemon.asm b/engine/events/give_pokemon.asm
index a65f65cc..00c642bb 100644
--- a/engine/events/give_pokemon.asm
+++ b/engine/events/give_pokemon.asm
@@ -18,7 +18,7 @@ _GivePokemon::
 	callfar LoadEnemyMonData
 	call SetPokedexOwnedFlag
 	callfar SendNewMonToBox
-	ld hl, wcf4b
+	ld hl, wStringBuffer
 	ld a, [wCurrentBoxNum]
 	and $7f
 	cp 9
diff --git a/engine/events/pokemart.asm b/engine/events/pokemart.asm
index c7cb8115..a1d69c72 100644
--- a/engine/events/pokemart.asm
+++ b/engine/events/pokemart.asm
@@ -159,7 +159,7 @@ DisplayPokemartDialogue_::
 	ld a, [wcf91] ; item ID
 	ld [wd11e], a ; store item ID for GetItemName
 	call GetItemName
-	call CopyStringToCF4B ; copy name to wcf4b
+	call CopyToStringBuffer
 	ld hl, PokemartTellBuyPriceText
 	call PrintText
 	hlcoord 14, 7
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index 7a499e28..9e3473f2 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -1433,9 +1433,9 @@ ItemUseMedicine:
 	jr .statNameLoop
 
 .gotStatName
-	ld de, wcf4b
+	ld de, wStringBuffer
 	ld bc, 10
-	call CopyData ; copy the stat's name to wcf4b
+	call CopyData ; copy the stat's name to wStringBuffer
 	ld a, SFX_HEAL_AILMENT
 	call PlaySound
 	ld hl, VitaminStatRoseText
@@ -2221,7 +2221,7 @@ ItemUsePPRestore:
 	ld a, [hl]
 	ld [wd11e], a
 	call GetMoveName
-	call CopyStringToCF4B ; copy name to wcf4b
+	call CopyToStringBuffer
 	pop hl
 	ld a, [wPPRestoreItem]
 	cp ETHER
@@ -2406,7 +2406,7 @@ ItemUseTMHM:
 	ld a, [wd11e]
 	ld [wMoveNum], a
 	call GetMoveName
-	call CopyStringToCF4B ; copy name to wcf4b
+	call CopyToStringBuffer
 	pop af
 	ld hl, BootedUpTMText
 	jr nc, .printBootedUpMachineText
@@ -2433,7 +2433,7 @@ ItemUseTMHM:
 	ld a, [wcf91]
 	push af
 .chooseMon
-	ld hl, wcf4b
+	ld hl, wStringBuffer
 	ld de, wTempMoveNameBuffer
 	ld bc, 14
 	call CopyData ; save the move name because DisplayPartyMenu will overwrite it
@@ -2444,7 +2444,7 @@ ItemUseTMHM:
 	call DisplayPartyMenu
 	push af
 	ld hl, wTempMoveNameBuffer
-	ld de, wcf4b
+	ld de, wStringBuffer
 	ld bc, 14
 	call CopyData
 	pop af
@@ -2835,7 +2835,7 @@ TossItem_::
 	ld a, [wcf91]
 	ld [wd11e], a
 	call GetItemName
-	call CopyStringToCF4B ; copy name to wcf4b
+	call CopyToStringBuffer
 	ld hl, IsItOKToTossItemText
 	call PrintText
 	hlcoord 14, 7
@@ -2855,7 +2855,7 @@ TossItem_::
 	ld a, [wcf91]
 	ld [wd11e], a
 	call GetItemName
-	call CopyStringToCF4B ; copy name to wcf4b
+	call CopyToStringBuffer
 	ld hl, ThrewAwayItemText
 	call PrintText
 	pop hl
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index 553c47d0..7969cdda 100644
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -38,7 +38,7 @@ AskName:
 	pop hl
 	pop af
 	ld [wUpdateSpritesEnabled], a
-	ld a, [wcf4b]
+	ld a, [wStringBuffer]
 	cp "@"
 	ret nz
 .declinedNickname
@@ -62,7 +62,7 @@ DisplayNameRaterScreen::
 	call GBPalWhiteOutWithDelay3
 	call RestoreScreenTilesAndReloadTilePatterns
 	call LoadGBPal
-	ld a, [wcf4b]
+	ld a, [wStringBuffer]
 	cp "@"
 	jr z, .playerCancelled
 	ld hl, wPartyMonNicks
@@ -107,7 +107,7 @@ DisplayNamingScreen:
 	ld a, 7
 	ld [wMaxMenuItem], a
 	ld a, "@"
-	ld [wcf4b], a
+	ld [wStringBuffer], a
 	xor a
 	ld hl, wNamingScreenSubmitName
 	ld [hli], a
@@ -155,7 +155,7 @@ DisplayNamingScreen:
 
 .submitNickname
 	pop de
-	ld hl, wcf4b
+	ld hl, wStringBuffer
 	ld bc, NAME_LENGTH
 	call CopyData
 	call GBPalWhiteOutWithDelay3
@@ -389,7 +389,7 @@ PrintNicknameAndUnderscores:
 	lb bc, 1, 10
 	call ClearScreenArea
 	hlcoord 10, 2
-	ld de, wcf4b
+	ld de, wStringBuffer
 	call PlaceString
 	hlcoord 10, 3
 	ld a, [wNamingScreenType]
@@ -451,9 +451,9 @@ DakutensAndHandakutens:
 
 INCLUDE "data/text/dakutens.asm"
 
-; calculates the length of the string at wcf4b and stores it in c
+; calculates the length of the string at wStringBuffer and stores it in c
 CalcStringLength:
-	ld hl, wcf4b
+	ld hl, wStringBuffer
 	ld c, $0
 .loop
 	ld a, [hl]
diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm
index 05a1fa56..6055db5c 100644
--- a/engine/menus/start_sub_menus.asm
+++ b/engine/menus/start_sub_menus.asm
@@ -384,7 +384,7 @@ StartMenu_Item::
 	ld a, [wcf91]
 	ld [wd11e], a
 	call GetItemName
-	call CopyStringToCF4B ; copy name to wcf4b
+	call CopyToStringBuffer
 	ld a, [wcf91]
 	cp BICYCLE
 	jr nz, .notBicycle2
diff --git a/engine/movie/oak_speech/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm
index dc6f0bdc..65d02d18 100644
--- a/engine/movie/oak_speech/oak_speech2.asm
+++ b/engine/movie/oak_speech/oak_speech2.asm
@@ -15,7 +15,7 @@ ChoosePlayerName:
 	xor a ; NAME_PLAYER_SCREEN
 	ld [wNamingScreenType], a
 	call DisplayNamingScreen
-	ld a, [wcf4b]
+	ld a, [wStringBuffer]
 	cp "@"
 	jr z, .customName
 	call ClearScreen
@@ -48,7 +48,7 @@ ChooseRivalName:
 	ld a, NAME_RIVAL_SCREEN
 	ld [wNamingScreenType], a
 	call DisplayNamingScreen
-	ld a, [wcf4b]
+	ld a, [wStringBuffer]
 	cp "@"
 	jr z, .customName
 	call ClearScreen
diff --git a/engine/movie/trade.asm b/engine/movie/trade.asm
index 7be100e0..a71ef745 100644
--- a/engine/movie/trade.asm
+++ b/engine/movie/trade.asm
@@ -191,7 +191,7 @@ LoadTradingGFXAndMonNames:
 	ld [wd11e], a
 	call GetMonName
 	ld hl, wcd6d
-	ld de, wcf4b
+	ld de, wStringBuffer
 	ld bc, NAME_LENGTH
 	call CopyData
 	ld a, [wTradedEnemyMonSpecies]
diff --git a/engine/movie/trade2.asm b/engine/movie/trade2.asm
index f0d91846..98d1158e 100644
--- a/engine/movie/trade2.asm
+++ b/engine/movie/trade2.asm
@@ -10,7 +10,7 @@ Trade_PrintPlayerMonInfoText:
 	lb bc, LEADING_ZEROES | 1, 3
 	call PrintNumber
 	hlcoord 5, 2
-	ld de, wcf4b
+	ld de, wStringBuffer
 	call PlaceString
 	hlcoord 8, 4
 	ld de, wTradedPlayerMonOT
diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm
index 165ae02d..d5449b5c 100644
--- a/engine/pokemon/evos_moves.asm
+++ b/engine/pokemon/evos_moves.asm
@@ -119,7 +119,7 @@ Evolution_PartyMonLoop: ; loop over party mons
 	ld a, [wWhichPokemon]
 	ld hl, wPartyMonNicks
 	call GetPartyMonName
-	call CopyStringToCF4B
+	call CopyToStringBuffer
 	ld hl, IsEvolvingText
 	call PrintText
 	ld c, 50
@@ -273,7 +273,7 @@ RenameEvolvedMon:
 	pop af
 	ld [wd0b5], a
 	ld hl, wcd6d
-	ld de, wcf4b
+	ld de, wStringBuffer
 .compareNamesLoop
 	ld a, [de]
 	inc de
@@ -359,7 +359,7 @@ LearnMoveFromLevelUp:
 	ld [wMoveNum], a
 	ld [wd11e], a
 	call GetMoveName
-	call CopyStringToCF4B
+	call CopyToStringBuffer
 	predef LearnMove
 	ld a, b
 	and a
diff --git a/engine/slots/slot_machine.asm b/engine/slots/slot_machine.asm
index ba007d9d..fc7f1ee7 100644
--- a/engine/slots/slot_machine.asm
+++ b/engine/slots/slot_machine.asm
@@ -446,7 +446,7 @@ SlotMachine_CheckForMatches:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld de, wcf4b
+	ld de, wStringBuffer
 	ld bc, 4
 	call CopyData
 	pop hl