Add the three banks of common text.

4 files changed, 22 insertions, 22 deletions

diff --git a/engine/main_menu.asm b/engine/main_menu.asm
index c7f4255d..2da93de6 100755
--- a/engine/main_menu.asm
+++ b/engine/main_menu.asm
@@ -198,7 +198,7 @@ Function5b9c: ; 5b9c (1:5b9c)
 	db "TIME NOT SET@"
 
 .UnusedText
-	text_jump ClockTimeUnknownText_
+	text_jump _ClockTimeUnknownText
 	db "@"
 
 Function5bb8: ; 5bb8 (1:5bb8)
@@ -426,7 +426,7 @@ InitializeMagikarpHouse: ; 5d47 (1:5d47)
 
 Function5d5d: ; 5d5d (1:5d5d)
 	ld hl, .Rival
-	ld de, wRivalsName
+	ld de, wRivalName
 	call .CopyName
 	ld hl, .Mom
 	ld de, wMomsName
@@ -814,11 +814,11 @@ OakSpeech: ; 5fa5 (1:5fa5)
 	ret
 
 OakText1:
-	text_jump OakText1_
+	text_jump _OakText1
 	db "@"
 
 OakText2:
-	text_jump OakText2_
+	text_jump _OakText2
 	start_asm
 	ld a, MARILL
 	call PlayCry
@@ -827,23 +827,23 @@ OakText2:
 	ret
 
 OakText3:
-	text_jump OakText3_
+	text_jump _OakText3
 	db "@"
 
 OakText4:
-	text_jump OakText4_
+	text_jump _OakText4
 	db "@"
 
 OakText5:
-	text_jump OakText5_
+	text_jump _OakText5
 	db "@"
 
 OakText6:
-	text_jump OakText6_
+	text_jump _OakText6
 	db "@"
 
 OakText7:
-	text_jump OakText7_
+	text_jump _OakText7
 	db "@"
 
 NamePlayer: ; 6085 (1:6085)
@@ -853,7 +853,7 @@ NamePlayer: ; 6085 (1:6085)
 	ld a, [wMenuCursorY]
 	dec a
 	jr z, .NewName
-	ld de, wPlayersName
+	ld de, wPlayerName
 	call StorePlayerName
 	callba ApplyMonOrTrainerPals
 	call MovePlayerPicLeft
@@ -861,7 +861,7 @@ NamePlayer: ; 6085 (1:6085)
 
 .NewName
 	ld b, $1
-	ld de, wPlayersName
+	ld de, wPlayerName
 	callba NamingScreen
 	call RotateThreePalettesRight
 	call ClearTileMap
@@ -875,7 +875,7 @@ NamePlayer: ; 6085 (1:6085)
 	ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS
 	call GetSGBLayout
 	call RotateThreePalettesLeft
-	ld hl, wPlayersName
+	ld hl, wPlayerName
 	ld de, .GoldSilver
 	call InitName
 	ret
diff --git a/engine/move_mon.asm b/engine/move_mon.asm
index f6e63d88..007f3b2a 100755
--- a/engine/move_mon.asm
+++ b/engine/move_mon.asm
@@ -33,7 +33,7 @@ TryAddMonToParty:: ; d892 (3:5892)
 	call SkipNames
 	ld d, h
 	ld e, l
-	ld hl, wPlayersName
+	ld hl, wPlayerName
 	ld bc, NAME_LENGTH
 	call CopyBytes
 	ld a, [wMonType]
@@ -857,7 +857,7 @@ SentPkmnIntoBox: ; de74 (3:5e74)
 	jr nz, .asm_de8b
 	call GetBaseData
 	call Functiondf4d
-	ld hl, wPlayersName
+	ld hl, wPlayerName
 	ld de, sBoxMonOT
 	ld bc, NAME_LENGTH
 	call CopyBytes
@@ -1604,7 +1604,7 @@ GivePoke: ; Give a Pokemon from script
 	ld a, b
 	and a
 	ret z
-	ld hl, Text_WasSentToBillsPC
+	ld hl, TextJump_WasSentToBillsPC
 	call PrintText
 	ld a, BANK(sBoxMonNicknames)
 	call OpenSRAM
@@ -1622,8 +1622,8 @@ Functione3af: ; e3af (3:63af)
 	ld b, $2
 	ret
 
-Text_WasSentToBillsPC:
-	text_jump Text_WasSentToBillsPC_
+TextJump_WasSentToBillsPC:
+	text_jump Text_WasSentToBillsPC
 	db "@"
 
 InitNickname: ; e3b9 (3:63b9)
diff --git a/engine/pack.asm b/engine/pack.asm
index 03349b34..f923c039 100755
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -609,7 +609,7 @@ Function108b6: ; 108b6 (4:48b6)
 	ret
 
 Text_AnEggCantHoldAnItem:
-	text_jump Text_AnEggCantHoldAnItem_
+	text_jump Text_AnEGGCantHoldAnItem
 	db "@"
 
 QuitItemSubmenu:
@@ -1545,7 +1545,7 @@ Text_ThisIsntTheTime:
 	db "@"
 
 Text_YouDontHaveAPokemon:
-	text_jump Text_YouDontHaveAPokemon_
+	text_jump Text_YouDontHaveAMon
 	db "@"
 
 Text_RegisteredTheItem:
@@ -1565,7 +1565,7 @@ Text_PackEmptyString:
 	db "@"
 
 Text_CantUseItInABattle:
-	text_jump Text_CantUseItInABattle_
+	text_jump Text_YouCantUseItInABattle
 	db "@"
 
 PackMenuGFX: INCBIN "gfx/misc/pack_menu.2bpp"
diff --git a/engine/specials.asm b/engine/specials.asm
index c08cee11..4232bb9e 100755
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -190,9 +190,9 @@ asm_c3f2
 
 Special_NameRival: ; c3f7
 	ld b, $2
-	ld de, wRivalsName
+	ld de, wRivalName
 	callba NamingScreen_
-	ld hl, wRivalsName
+	ld hl, wRivalName
 	ld de, .DefaultName
 	call InitName
 	ret