Bank9 misc. functions

PrintMonType and SaveTrainerName

7 files changed, 66 insertions, 67 deletions

diff --git a/engine/battle/get_trainer_name.asm b/engine/battle/get_trainer_name.asm
index 16a94ec5..bbc577b3 100644
--- a/engine/battle/get_trainer_name.asm
+++ b/engine/battle/get_trainer_name.asm
@@ -20,6 +20,6 @@ GetTrainerName_: ; f67a5 (3d:67a5)
 	ld hl, wcd6d
 .foundName
 .rival
-	ld de, W_TRAINERNAME
+	ld de, wTrainerName
 	ld bc, $d
 	jp CopyData
diff --git a/engine/battle/print_type.asm b/engine/battle/print_type.asm
index 0270f8b7..b90f5682 100644
--- a/engine/battle/print_type.asm
+++ b/engine/battle/print_type.asm
@@ -1,6 +1,6 @@
 ; [wd0b5] = pokemon ID
 ; hl = dest addr
-PrintMonType: ; 27d6b (9:7d6b)
+PrintMonType: ; 27d20 (9:7d20)
 	call GetPredefRegisters
 	push hl
 	call GetMonHeader
@@ -19,25 +19,25 @@ PrintMonType: ; 27d6b (9:7d6b)
 
 ; a = type
 ; hl = dest addr
-PrintType: ; 27d89 (9:7d89)
+PrintType: ; 27d3e (9:7d3e)
 	push hl
 	jr PrintType_
 
 ; erase "TYPE2/" if the mon only has 1 type
-EraseType2Text: ; 27d8c (9:7d8c)
+EraseType2Text: ; 27d41 (9:7d41)
 	ld a, " "
 	ld bc, $13
 	add hl, bc
 	ld bc, $6
 	jp FillMemory
 
-PrintMoveType: ; 27d98 (9:7d98)
+PrintMoveType: ; 27d4d (9:7d4d)
 	call GetPredefRegisters
 	push hl
 	ld a, [W_PLAYERMOVETYPE]
 ; fall through
 
-PrintType_: ; 27d9f (9:7d9f)
+PrintType_: ; 27d54 (9:7d54)
 	add a
 	ld hl, TypeNames
 	ld e, a
diff --git a/engine/battle/save_trainer_name.asm b/engine/battle/save_trainer_name.asm
index 84ef1f69..a5a578af 100644
--- a/engine/battle/save_trainer_name.asm
+++ b/engine/battle/save_trainer_name.asm
@@ -1,4 +1,4 @@
-SaveTrainerName: ; 27e4a (9:7e4a)
+SaveTrainerName: ; 27dff (9:7dff)
 	ld hl,TrainerNamePointers
 	ld a,[W_TRAINERCLASS]
 	dec a
@@ -18,95 +18,95 @@ SaveTrainerName: ; 27e4a (9:7e4a)
 	jr nz,.CopyCharacter
 	ret
 
-TrainerNamePointers: ; 27e64 (9:7e64)
+TrainerNamePointers: ; 27e19 (9:7e19)
 ; what is the point of these?
 	dw YoungsterName
 	dw BugCatcherName
 	dw LassName
-	dw W_TRAINERNAME
+	dw wTrainerName
 	dw JrTrainerMName
 	dw JrTrainerFName
 	dw PokemaniacName
 	dw SuperNerdName
-	dw W_TRAINERNAME
-	dw W_TRAINERNAME
+	dw wTrainerName
+	dw wTrainerName
 	dw BurglarName
 	dw EngineerName
 	dw JugglerXName
-	dw W_TRAINERNAME
+	dw wTrainerName
 	dw SwimmerName
-	dw W_TRAINERNAME
-	dw W_TRAINERNAME
+	dw wTrainerName
+	dw wTrainerName
 	dw BeautyName
-	dw W_TRAINERNAME
+	dw wTrainerName
 	dw RockerName
 	dw JugglerName
-	dw W_TRAINERNAME
-	dw W_TRAINERNAME
+	dw wTrainerName
+	dw wTrainerName
 	dw BlackbeltName
-	dw W_TRAINERNAME
+	dw wTrainerName
 	dw ProfOakName
 	dw ChiefName
 	dw ScientistName
-	dw W_TRAINERNAME
+	dw wTrainerName
 	dw RocketName
 	dw CooltrainerMName
 	dw CooltrainerFName
-	dw W_TRAINERNAME
-	dw W_TRAINERNAME
-	dw W_TRAINERNAME
-	dw W_TRAINERNAME
-	dw W_TRAINERNAME
-	dw W_TRAINERNAME
-	dw W_TRAINERNAME
-	dw W_TRAINERNAME
-	dw W_TRAINERNAME
-	dw W_TRAINERNAME
-	dw W_TRAINERNAME
-	dw W_TRAINERNAME
-	dw W_TRAINERNAME
-	dw W_TRAINERNAME
-	dw W_TRAINERNAME
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
+	dw wTrainerName
 
-YoungsterName: ; 27ec2 (9:7ec2)
+YoungsterName: ; 27e77 (9:7e77)
 	db "YOUNGSTER@"
-BugCatcherName: ; 27ecc (9:7ecc)
+BugCatcherName: ; 27e81 (9:7e81)
 	db "BUG CATCHER@"
-LassName: ; 27ed8 (9:7ed8)
+LassName: ; 27e8d (9:7e8d)
 	db "LASS@"
-JrTrainerMName: ; 27edd (9:7edd)
+JrTrainerMName: ; 27e92 (9:7e92)
 	db "JR.TRAINER♂@"
-JrTrainerFName: ; 27ee9 (9:7ee9)
+JrTrainerFName: ; 27e9e (9:7e9e)
 	db "JR.TRAINER♀@"
-PokemaniacName: ; 27ef5 (9:7ef5)
+PokemaniacName: ; 27eaa (9:7eaa)
 	db "POKéMANIAC@"
-SuperNerdName: ; 27f00 (9:7f00)
+SuperNerdName: ; 27eb5 (9:7eb5)
 	db "SUPER NERD@"
-BurglarName: ; 27f0b (9:7f0b)
+BurglarName: ; 27ec0 (9:7ec0)
 	db "BURGLAR@"
-EngineerName: ; 27f13 (9:7f13)
+EngineerName: ; 27ec8 (9:7ec8)
 	db "ENGINEER@"
-JugglerXName: ; 27f1c (9:7f1c)
+JugglerXName: ; 27ed1 (9:7ed1)
 	db "JUGGLER@"
-SwimmerName: ; 27f24 (9:7f24)
+SwimmerName: ; 27ed9 (9:7ed9)
 	db "SWIMMER@"
-BeautyName: ; 27f2c (9:7f2c)
+BeautyName: ; 27ee1 (9:7ee1)
 	db "BEAUTY@"
-RockerName: ; 27f33 (9:7f33)
+RockerName: ; 27ee8 (9:7ee8)
 	db "ROCKER@"
-JugglerName: ; 27f3a (9:7f3a)
+JugglerName: ; 27eef (9:7eef)
 	db "JUGGLER@"
-BlackbeltName: ; 27f42 (9:7f42)
+BlackbeltName: ; 27ef7 (9:7ef7)
 	db "BLACKBELT@"
-ProfOakName: ; 27f4c (9:7f4c)
+ProfOakName: ; 27f01 (9:7f01)
 	db "PROF.OAK@"
-ChiefName: ; 27f55 (9:7f55)
+ChiefName: ; 27f0a (9:7f0a)
 	db "CHIEF@"
-ScientistName: ; 27f5b (9:7f5b)
+ScientistName: ; 27f10 (9:7f10)
 	db "SCIENTIST@"
-RocketName: ; 27f65 (9:7f65)
+RocketName: ; 27f1a (9:7f1a)
 	db "ROCKET@"
-CooltrainerMName: ; 27f6c (9:7f6c)
+CooltrainerMName: ; 27f21 (9:7f21)
 	db "COOLTRAINER♂@"
-CooltrainerFName: ; 27f79 (9:7f79)
+CooltrainerFName: ; 27f2e (9:7f2e)
 	db "COOLTRAINER♀@"
diff --git a/text.asm b/text.asm
index 1c665229..175dd974 100644
--- a/text.asm
+++ b/text.asm
@@ -232,7 +232,7 @@ INCLUDE "text/maps/seafoam_islands_b3f.asm"
 INCLUDE "text/maps/seafoam_islands_b4f.asm"
 
 _AIBattleWithdrawText::
-	TX_RAM W_TRAINERNAME
+	TX_RAM wTrainerName
 	text " with-"
 	line "drew @"
 	TX_RAM wEnemyMonNick
@@ -240,7 +240,7 @@ _AIBattleWithdrawText::
 	prompt
 
 _AIBattleUseItemText::
-	TX_RAM W_TRAINERNAME
+	TX_RAM wTrainerName
 	db $0
 	line "used @"
 	TX_RAM wcd6d
@@ -1138,7 +1138,7 @@ _MoneyForWinningText::
 _TrainerDefeatedText::
 	text $52, " defeated"
 	line "@"
-	TX_RAM W_TRAINERNAME
+	TX_RAM wTrainerName
 	text "!"
 	prompt
 
@@ -1168,12 +1168,12 @@ _PlayerBlackedOutText2::
 _LinkBattleLostText::
 	text $52, " lost to"
 	line "@"
-	TX_RAM W_TRAINERNAME
+	TX_RAM wTrainerName
 	text "!"
 	prompt
 
 _TrainerAboutToUseText::
-	TX_RAM W_TRAINERNAME
+	TX_RAM wTrainerName
 	text " is"
 	line "about to use"
 	cont"@"
@@ -1185,7 +1185,7 @@ _TrainerAboutToUseText::
 	done
 
 _TrainerSentOutText::
-	TX_RAM W_TRAINERNAME
+	TX_RAM wTrainerName
 	text " sent"
 	line "out @"
 	TX_RAM wEnemyMonNick
@@ -1542,7 +1542,7 @@ _EnemyAppearedText::
 	prompt
 
 _TrainerWantsToFightText::
-	TX_RAM W_TRAINERNAME
+	TX_RAM wTrainerName
 	text " wants"
 	line "to fight!"
 	prompt
diff --git a/text/type_names.asm b/text/type_names.asm
index d94675b8..5658b683 100755
--- a/text/type_names.asm
+++ b/text/type_names.asm
@@ -1,4 +1,4 @@
-TypeNames:
+TypeNames: ; 27d63 (9:7d63)
 
 	dw .Normal
 	dw .Fighting
diff --git a/wram.asm b/wram.asm
index ee070fbf..8ed01add 100755
--- a/wram.asm
+++ b/wram.asm
@@ -1582,7 +1582,7 @@ wMissableObjectCounter:: ; d048
 
 	ds 1
 
-W_TRAINERNAME:: ; d04a
+wTrainerName:: ; d04a
 ; 13 bytes for the letters of the opposing trainer
 ; the name is terminated with $50 with possible
 ; unused trailing letters
diff --git a/yellow/main.asm b/yellow/main.asm
index b4dfa440..99acf4a5 100755
--- a/yellow/main.asm
+++ b/yellow/main.asm
@@ -3720,9 +3720,8 @@ PinsirPicBack:       INCBIN "pic/monback/pinsirb.pic"
 TangelaPicFront:     INCBIN "pic/ymon/tangela.pic"
 TangelaPicBack:      INCBIN "pic/monback/tangelab.pic"
 
-	dr $27d20,$27dff
-SaveTrainerName: ; 27dff (9:7dff)
-	dr $27dff,$28000
+INCLUDE "engine/battle/print_type.asm"
+INCLUDE "engine/battle/save_trainer_name.asm"
 
 SECTION "Pics 2", ROMX, BANK[PICS_2]