Commented/labelled misc functions

2026-02-06 15:45:24 +13:00 · 2014-09-14 11:29:18 -07:00 · 2014-09-14 11:29:18 -07:00 · 2ed65d9c3e
commit 2ed65d9c3e
parent 0c916aea33
114 changed files with 733 additions and 668 deletions
--- a/scripts/agatha.asm
+++ b/scripts/agatha.asm
@ -24,7 +24,7 @@ AgathaScript_76443: ; 76443 (1d:6443)
 AgathaScript_76459: ; 76459 (1d:6459)
 	ld [wd09f], a
 	ld bc, $2
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock

 AgathaScript_76464: ; 76464 (1d:6464)
 	xor a
@ -33,7 +33,7 @@ AgathaScript_76464: ; 76464 (1d:6464)

 AgathaScriptPointers: ; 76469 (1d:6469)
 	dw AgathaScript0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw AgathaScript2
 	dw AgathaScript3
 	dw AgathaScript4
--- a/scripts/bruno.asm
+++ b/scripts/bruno.asm
@ -24,7 +24,7 @@ BrunoScript_762ec: ; 762ec (1d:62ec)
 BrunoScript_76302: ; 76302 (1d:6302)
 	ld [wd09f], a
 	ld bc, $2
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock

 BrunoScript_7630d: ; 7630d (1d:630d)
 	xor a
@ -33,7 +33,7 @@ BrunoScript_7630d: ; 7630d (1d:630d)

 BrunoScriptPointers: ; 76312 (1d:6312)
 	dw BrunoScript0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw BrunoScript2
 	dw BrunoScript3
 	dw BrunoScript4
--- a/scripts/celadongamecorner.asm
+++ b/scripts/celadongamecorner.asm
@ -34,7 +34,7 @@ CeladonGameCornerScript_48bec: ; 48bec (12:4bec)
 	ld a, $2a
 	ld [wd09f], a
 	ld bc, $0208
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock

 CeladonGameCornerScript_48c07: ; 48c07 (12:4c07)
 	xor a
@ -409,7 +409,7 @@ CeladonGameCornerText11: ; 48e9d (12:4e9d)
 	set 7, [hl]
 	ld hl, CeladonGameCornerText_48ed3
 	ld de, CeladonGameCornerText_48ed3
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ldh a, [$8c]
 	ld [wSpriteIndex], a
 	call EngageMapTrainer
@ -449,7 +449,7 @@ CeladonGameCornerText12: ; 48edd (12:4edd)
 	ld a, $43
 	ld [wd09f], a
 	ld bc, $0208
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	jp TextScriptEnd

 CeladonGameCornerText_48f09: ; 48f09 (12:4f09)
--- a/scripts/celadongym.asm
+++ b/scripts/celadongym.asm
@ -31,7 +31,7 @@ CeladonGymText_48943: ; 48943 (12:4943)

 CeladonGymScriptPointers: ; 4894e (12:494e)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw CeladonGymScript3

@ -177,7 +177,7 @@ CeladonGymText1: ; 48a11 (12:4a11)
 	set 7, [hl]
 	ld hl, CeladonGymText_48a63
 	ld de, CeladonGymText_48a63
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ldh a, [$8c]
 	ld [wSpriteIndex], a
 	call EngageMapTrainer
--- a/scripts/ceruleancity.asm
+++ b/scripts/ceruleancity.asm
@ -133,7 +133,7 @@ CeruleanCityScript1: ; 19567 (6:5567)
 	set 7, [hl]
 	ld hl, CeruleanCityText_1966d
 	ld de, CeruleanCityText_19672
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ld a, SONY1 + $c8
 	ld [W_CUROPPONENT], a

@ -277,7 +277,7 @@ CeruleanCityText2: ; 1967c (6:567c)
 	set 7, [hl]
 	ld hl, CeruleanCityText_196ee
 	ld de, CeruleanCityText_196ee
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ld a, [$ff8c]
 	ld [wSpriteIndex], a
 	call EngageMapTrainer
--- a/scripts/ceruleangym.asm
+++ b/scripts/ceruleangym.asm
@ -31,7 +31,7 @@ CeruleanGymScript_5c6ed: ; 5c6ed (17:46ed)

 CeruleanGymScriptPointers: ; 5c6f8 (17:46f8)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw CeruleanGymScript3

@ -126,7 +126,7 @@ CeruleanGymText1: ; 5c771 (17:4771)
 	set 7, [hl]
 	ld hl, CeruleanGymText_5c7d8
 	ld de, CeruleanGymText_5c7d8
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ldh a, [$8c]
 	ld [wSpriteIndex], a
 	call EngageMapTrainer
--- a/scripts/cinnabargym.asm
+++ b/scripts/cinnabargym.asm
@ -224,7 +224,7 @@ CinnabarGymText1: ; 758df (1d:58df)
 	call PrintText
 	ld hl, BlaineEndBattleText
 	ld de, BlaineEndBattleText
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ld a, $7
 	ld [W_GYMLEADERNO], a
 	jp CinnabarGymScript_758b7
@ -267,7 +267,7 @@ CinnabarGymText2: ; 75939 (1d:5939)
 	call PrintText
 	ld hl, CinnabarGymText_75964
 	ld de, CinnabarGymText_75964 ; $5964 XXX
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	jp CinnabarGymScript_758b7
 .asm_46bb4 ; 0x75956
 	ld hl, CinnabarGymText_75969
@ -296,7 +296,7 @@ CinnabarGymText3: ; 7596e (1d:596e)
 	call PrintText
 	ld hl, CinnabarGymText_75999
 	ld de, CinnabarGymText_75999 ; $5999 XXX
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	jp CinnabarGymScript_758b7
 .asm_4b406 ; 0x7598b
 	ld hl, CinnabarGymText_7599e
@ -325,7 +325,7 @@ CinnabarGymText4: ; 759a3 (1d:59a3)
 	call PrintText
 	ld hl, CinnabarGymText_759ce
 	ld de, CinnabarGymText_759ce ; $59ce XXX
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	jp CinnabarGymScript_758b7
 .asm_c0673 ; 0x759c0
 	ld hl, CinnabarGymText_759d3
@ -354,7 +354,7 @@ CinnabarGymText5: ; 759d8 (1d:59d8)
 	call PrintText
 	ld hl, CinnabarGymText_75a03
 	ld de, CinnabarGymText_75a03 ; $5a03 XXX
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	jp CinnabarGymScript_758b7
 .asm_5cfd7 ; 0x759f5
 	ld hl, CinnabarGymText_75a08
@ -383,7 +383,7 @@ CinnabarGymText6: ; 75a0d (1d:5a0d)
 	call PrintText
 	ld hl, CinnabarGymText_75a38
 	ld de, CinnabarGymText_75a38
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	jp CinnabarGymScript_758b7
 .asm_776b4 ; 0x75a2a
 	ld hl, CinnabarGymText_75a3d
@ -412,7 +412,7 @@ CinnabarGymText7: ; 75a42 (1d:5a42)
 	call PrintText
 	ld hl, CinnabarGymText_75a6d
 	ld de, CinnabarGymText_75a6d
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	jp CinnabarGymScript_758b7
 .asm_2f755 ; 0x75a5f
 	ld hl, CinnabarGymText_75a72
@ -441,7 +441,7 @@ CinnabarGymText8: ; 75a77 (1d:5a77)
 	call PrintText
 	ld hl, CinnabarGymText_75aa2
 	ld de, CinnabarGymText_75aa2 ; $5aa2 XXX
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	jp CinnabarGymScript_758b7
 .asm_d87be ; 0x75a94
 	ld hl, CinnabarGymText_75aa7
--- a/scripts/fightingdojo.asm
+++ b/scripts/fightingdojo.asm
@ -16,7 +16,7 @@ FightingDojoScript_5cd70: ; 5cd70 (17:4d70)

 FightingDojoScriptPointers: ; 5cd7b (17:4d7b)
 	dw FightingDojoScript1
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw FightingDojoScript3

@ -147,7 +147,7 @@ FightingDojoText1: ; 5ce44 (17:4e44)
 	set 7, [hl]
 	ld hl, FightingDojoText_5ce93
 	ld de, FightingDojoText_5ce93
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ldh a, [$8c]
 	ld [wSpriteIndex], a
 	call EngageMapTrainer
--- a/scripts/fuchsiagym.asm
+++ b/scripts/fuchsiagym.asm
@ -32,7 +32,7 @@ FuchsiaGymScript_75477: ; 75477 (1d:5477)

 FuchsiaGymScriptPointers: ; 75482 (1d:5482)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw FuchsiaGymScript3

@ -166,7 +166,7 @@ FuchsiaGymText1: ; 75534 (1d:5534)
 	set 7, [hl]
 	ld hl, UnnamedText_75586
 	ld de, UnnamedText_75586
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ldh a, [$8c]
 	ld [wSpriteIndex], a
 	call EngageMapTrainer
--- a/scripts/gary.asm
+++ b/scripts/gary.asm
@ -63,7 +63,7 @@ GaryScript2: ; 75f6a (1d:5f6a)
 	set 7, [hl]
 	ld hl, GaryText_760f9
 	ld de, GaryText_760fe
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ld a, SONY3 + $c8
 	ld [W_CUROPPONENT], a

--- a/scripts/lance.asm
+++ b/scripts/lance.asm
@ -34,7 +34,7 @@ LanceScript_5a2de: ; 5a2de (16:62de)
 	ld bc, $603

 LanceScript_5a2f0: ; 5a2f0 (16:62f0)
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock

 LanceScript_5a2f5: ; 5a2f5 (16:62f5)
 	xor a
@ -43,7 +43,7 @@ LanceScript_5a2f5: ; 5a2f5 (16:62f5)

 LanceScriptPointers: ; 5a2fa (16:62fa)
 	dw LanceScript0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw LanceScript2
 	dw LanceScript3
 	dw LanceScript4
--- a/scripts/lorelei.asm
+++ b/scripts/lorelei.asm
@ -25,7 +25,7 @@ LoreleiScript_76191: ; 76191 (1d:6191)
 .asm_761ab
 	ld [wd09f], a
 	ld bc, $2
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock

 LoreleiScript_761b6: ; 761b6 (1d:61b6)
 	xor a
@ -34,7 +34,7 @@ LoreleiScript_761b6: ; 761b6 (1d:61b6)

 LoreleiScriptPointers: ; 761bb (1d:61bb)
 	dw LoreleiScript0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw LoreleiScript2
 	dw LoreleiScript3
 	dw LoreleiScript4
--- a/scripts/mansion1.asm
+++ b/scripts/mansion1.asm
@ -43,7 +43,7 @@ Mansion1Script_4430b: ; 4430b (11:430b)
 	ld a, $e
 	ld [wd09f], a
 asm_44310: ; 44310 (11:4310)
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	ret

 Mansion1Script_Switches: ; 44316 (11:4316)
@ -58,7 +58,7 @@ Mansion1Script_Switches: ; 44316 (11:4316)

 Mansion1ScriptPointers: ; 44326 (11:4326)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 Mansion1TextPointers: ; 4432c (11:432c)
--- a/scripts/mansion2.asm
+++ b/scripts/mansion2.asm
@ -40,7 +40,7 @@ Mansion2Script_51fee: ; 51fee (14:5fee)

 Mansion2Script_5202f: ; 5202f (14:602f)
 	ld [wd09f], a
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock

 Mansion2Script_Switches: ; 52037 (14:6037)
 	ld a, [wSpriteStateData1 + 9]
@ -54,7 +54,7 @@ Mansion2Script_Switches: ; 52037 (14:6037)

 Mansion2ScriptPointers: ; 52047 (14:6047)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 Mansion2TextPointers: ; 5204d (14:604d)
--- a/scripts/mansion3.asm
+++ b/scripts/mansion3.asm
@ -34,7 +34,7 @@ Mansion3Script_52204: ; 52204 (14:6204)

 Mansion3ScriptPointers: ; 52235 (14:6235)
 	dw Mansion3Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 Mansion3Script0: ; 5223b (14:623b)
--- a/scripts/mansion4.asm
+++ b/scripts/mansion4.asm
@ -56,7 +56,7 @@ Mansion4Script_Switches: ; 52420 (14:6420)

 Mansion4ScriptPointers: ; 52430 (14:6430)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 Mansion4TextPointers: ; 52436 (14:6436)
--- a/scripts/mtmoon1.asm
+++ b/scripts/mtmoon1.asm
@ -9,7 +9,7 @@ MtMoon1Script: ; 499c8 (12:59c8)

 MtMoon1ScriptPointers: ; 499db (12:59db)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 MtMoon1TextPointers: ; 499e1 (12:59e1)
--- a/scripts/mtmoon3.asm
+++ b/scripts/mtmoon3.asm
@ -47,7 +47,7 @@ MtMoon3Script_49d58: ; 49d58 (12:5d58)

 MtMoon3ScriptPointers: ; 49d63 (12:5d63)
 	dw MtMoon3Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw MtMoon3Script3
 	dw MtMoon3Script4
@ -228,7 +228,7 @@ MtMoon3Text1: ; 49e79 (12:5e79)
 	set 7, [hl]
 	ld hl, MtMoon3Text_49f8a
 	ld de, MtMoon3Text_49f8a
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ldh a, [$8c]
 	ld [wSpriteIndex], a
 	call EngageMapTrainer
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@ -378,7 +378,7 @@ OaksLabScript11: ; 1cdb9 (7:4db9)
 	call GetSpritePosition1
 	ld hl, OaksLabText_1d3be
 	ld de, OaksLabText_1d3c3
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ld hl, wd72d
 	set 6, [hl]
 	set 7, [hl]
--- a/scripts/pewtergym.asm
+++ b/scripts/pewtergym.asm
@ -31,7 +31,7 @@ PewterGymScript_5c3bf: ; 5c3bf (17:43bf)

 PewterGymScriptPointers: ; 5c3ca (17:43ca)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw PewterGymScript3

@ -126,7 +126,7 @@ PewterGymText1: ; 5c44e (17:444e)
 	set 7, [hl]
 	ld hl, PewterGymText_5c4bc
 	ld de, PewterGymText_5c4bc
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ldh a, [$8c]
 	ld [wSpriteIndex], a
 	call EngageMapTrainer
--- a/scripts/pokemontower2.asm
+++ b/scripts/pokemontower2.asm
@ -130,7 +130,7 @@ PokemonTower2Text1: ; 605df (18:45df)
 	set 7, [hl]
 	ld hl, PokemonTower2Text_60632
 	ld de, PokemonTower2Text_60637 ; XXX $4637
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ld a, SONY2 + $c8
 	ld [W_CUROPPONENT], a

--- a/scripts/pokemontower3.asm
+++ b/scripts/pokemontower3.asm
@ -9,7 +9,7 @@ PokemonTower3Script: ; 606cc (18:46cc)

 PokemonTower3ScriptPointers: ; 606df (18:46df)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 PokemonTower3TextPointers: ; 606e5 (18:46e5)
--- a/scripts/pokemontower4.asm
+++ b/scripts/pokemontower4.asm
@ -9,7 +9,7 @@ PokemonTower4Script: ; 607f6 (18:47f6)

 PokemonTower4ScriptPointers: ; 60809 (18:4809)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 PokemonTower4TextPointers: ; 6080f (18:480f)
--- a/scripts/pokemontower5.asm
+++ b/scripts/pokemontower5.asm
@ -9,7 +9,7 @@ PokemonTower5Script: ; 60932 (18:4932)

 PokemonTower5ScriptPointers: ; 60945 (18:4945)
 	dw PokemonTower5Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 PokemonTower5Script0: ; 6094b (18:494b)
--- a/scripts/pokemontower6.asm
+++ b/scripts/pokemontower6.asm
@ -16,7 +16,7 @@ PokemonTower6Script_60b02: ; 60b02 (18:4b02)

 PokemonTower6ScriptPointers: ; 60b0d (18:4b0d)
 	dw PokemonTower6Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw PokemonTower6Script3
 	dw PokemonTower6Script4
--- a/scripts/pokemontower7.asm
+++ b/scripts/pokemontower7.asm
@ -16,7 +16,7 @@ PokemonTower7Script_60d18: ; 60d18 (18:4d18)

 PokemonTower7ScriptPointers: ; 60d23 (18:4d23)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw PokemonTower7Script2
 	dw PokemonTower7Script3
 	dw PokemonTower7Script4
--- a/scripts/powerplant.asm
+++ b/scripts/powerplant.asm
@ -9,7 +9,7 @@ PowerPlantScript: ; 1e2c6 (7:62c6)

 PowerPlantScriptPointers: ; 1e2d9 (7:62d9)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 PowerPlantTextPointers: ; 1e2df (7:62df)
--- a/scripts/rockethideout1.asm
+++ b/scripts/rockethideout1.asm
@ -30,11 +30,11 @@ RocketHideout1Script_44be0: ; 44be0 (11:4be0)
 .asm_44c03
 	ld [wd09f], a
 	ld bc, $080c
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock

 RocketHideout1ScriptPointers: ; 44c0e (11:4c0e)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 RocketHideout1TextPointers: ; 44c14 (11:4c14)
--- a/scripts/rockethideout2.asm
+++ b/scripts/rockethideout2.asm
@ -9,7 +9,7 @@ RocketHideout2Script: ; 44e27 (11:4e27)

 RocketHideout2ScriptPointers: ; 44e3a (11:4e3a)
 	dw RocketHideout2Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw RocketHideout2Script3

@ -19,7 +19,7 @@ RocketHideout2Script0: ; 44e42 (11:4e42)
 	ld a, [W_XCOORD]
 	ld c, a
 	ld hl, RocketHideout2ArrowTilePlayerMovement
-	call Func_3442
+	call DecodeArrowMovementRLE
 	cp $ff
 	jp z, CheckFightingMapTrainers
 	ld hl, wd736
--- a/scripts/rockethideout3.asm
+++ b/scripts/rockethideout3.asm
@ -9,7 +9,7 @@ RocketHideout3Script: ; 45225 (11:5225)

 RocketHideout3ScriptPointers: ; 45238 (11:5238)
 	dw RocketHideout3Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw RocketHideout3Script3

@ -19,7 +19,7 @@ RocketHideout3Script0: ; 45240 (11:5240)
 	ld a, [W_XCOORD]
 	ld c, a
 	ld hl, RocketHideout3ArrowTilePlayerMovement
-	call Func_3442
+	call DecodeArrowMovementRLE
 	cp $ff
 	jp z, CheckFightingMapTrainers
 	ld hl, wd736
--- a/scripts/rockethideout4.asm
+++ b/scripts/rockethideout4.asm
@ -31,7 +31,7 @@ RocketHideout4Script_45473: ; 45473 (11:5473)
 .asm_45498
 	ld [wd09f], a
 	ld bc, $050c
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock

 RocketHideout4Script_454a3: ; 454a3 (11:54a3)
 	xor a
@ -42,7 +42,7 @@ RocketHideout4Script_454a3: ; 454a3 (11:54a3)

 RocketHideout4ScriptPointers: ; 454ae (11:54ae)c
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw RocketHideout4Script3

@ -130,7 +130,7 @@ RocketHideout4Text1: ; 4553a (11:553a)
 	set 7, [hl]
 	ld hl, RocketHideout4Text_4557f
 	ld de, RocketHideout4Text_4557f
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ldh a, [$8c]
 	ld [wSpriteIndex], a
 	call EngageMapTrainer
--- a/scripts/rocktunnel1.asm
+++ b/scripts/rocktunnel1.asm
@ -9,7 +9,7 @@ RockTunnel1Script: ; 444dc (11:44dc)

 RockTunnel1ScriptPointers: ; 444ef (11:44ef)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 RockTunnel1TextPointers: ; 444f5 (11:44f5)
--- a/scripts/rocktunnel2.asm
+++ b/scripts/rocktunnel2.asm
@ -9,7 +9,7 @@ RockTunnel2Script: ; 45feb (11:5feb)

 RockTunnel2ScriptPointers: ; 45ffe (11:5ffe)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 RockTunnel2TextPointers: ; 46004 (11:6004)
--- a/scripts/route10.asm
+++ b/scripts/route10.asm
@ -9,7 +9,7 @@ Route10Script: ; 59336 (16:5336)

 Route10ScriptPointers: ; 59349 (16:5349)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 Route10TextPointers: ; 5934f (16:534f)
--- a/scripts/route11.asm
+++ b/scripts/route11.asm
@ -9,7 +9,7 @@ Route11Script: ; 5944c (16:544c)

 Route11ScriptPointers: ; 5945f (16:545f)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 Route11TextPointers: ; 59465 (16:5465)
--- a/scripts/route12.asm
+++ b/scripts/route12.asm
@ -16,7 +16,7 @@ Route12Script_59606: ; 59606 (16:5606)

 Route12ScriptPointers: ; 59611 (16:5611)
 	dw Route12Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw Route12Script3

--- a/scripts/route13.asm
+++ b/scripts/route13.asm
@ -9,7 +9,7 @@ Route13Script: ; 5581e (15:581e)

 Route13ScriptPointers: ; 55831 (15:5831)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 Route13TextPointers: ; 55837 (15:5837)
--- a/scripts/route14.asm
+++ b/scripts/route14.asm
@ -9,7 +9,7 @@ Route14Script: ; 559d3 (15:59d3)

 Route14ScriptPointers: ; 559e6 (15:59e6)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 Route14TextPointers: ; 559ec (15:59ec)
--- a/scripts/route15.asm
+++ b/scripts/route15.asm
@ -9,7 +9,7 @@ Route15Script: ; 597ae (16:57ae)

 Route15ScriptPointers: ; 597c1 (16:57c1)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 Route15TextPointers: ; 597c7 (16:57c7)
--- a/scripts/route16.asm
+++ b/scripts/route16.asm
@ -16,7 +16,7 @@ Route16Script_59946: ; 59946 (16:5946)

 Route16ScriptPointers: ; 59951 (16:5951)
 	dw Route16Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw Route16Script3

--- a/scripts/route17.asm
+++ b/scripts/route17.asm
@ -9,7 +9,7 @@ Route17Script: ; 55b7a (15:5b7a)

 Route17ScriptPointers: ; 55b8d (15:5b8d)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 Route17TextPointers: ; 55b93 (15:5b93)
--- a/scripts/route18.asm
+++ b/scripts/route18.asm
@ -9,7 +9,7 @@ Route18Script: ; 59ac7 (16:5ac7)

 Route18ScriptPointers: ; 59ada (16:5ada)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 Route18TextPointers: ; 59ae0 (16:5ae0)
--- a/scripts/route19.asm
+++ b/scripts/route19.asm
@ -9,7 +9,7 @@ Route19Script: ; 55d44 (15:5d44)

 Route19ScriptPointers: ; 55d57 (15:5d57)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 Route19TextPointers: ; 55d5d (15:5d5d)
--- a/scripts/route20.asm
+++ b/scripts/route20.asm
@ -58,7 +58,7 @@ Route20Script_50d14: ; 50d14 (14:4d14)

 Route20ScriptPointers: ; 50d1c (14:4d1c)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 Route20TextPointers: ; 50d22 (14:4d22)
--- a/scripts/route21.asm
+++ b/scripts/route21.asm
@ -9,7 +9,7 @@ Route21Script: ; 55eeb (15:5eeb)

 Route21ScriptPointers: ; 55efe (15:5efe)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 Route21TextPointers: ; 55f04 (15:5f04)
--- a/scripts/route22.asm
+++ b/scripts/route22.asm
@ -128,7 +128,7 @@ Route22Script1: ; 50f62 (14:4f62)
 	set 7, [hl]
 	ld hl, Route22RivalDefeatedText1
 	ld de, Route22Text_511bc
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ld a, SONY1 + $c8
 	ld [W_CUROPPONENT], a
 	ld hl, StarterMons_50faf ; $4faf
@ -270,7 +270,7 @@ Route22Script4: ; 51087 (14:5087)
 	set 7, [hl]
 	ld hl, Route22RivalDefeatedText2 ; $51cb
 	ld de, Route22Text_511d0 ; $51d0
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ld a, SONY2 + $c8
 	ld [W_CUROPPONENT], a ; wd059
 	ld hl, StarterMons_510d9 ; $50d9
--- a/scripts/route24.asm
+++ b/scripts/route24.asm
@ -16,7 +16,7 @@ Route24Script_513c0: ; 513c0 (14:53c0)

 Route24ScriptPointers: ; 513cb (14:53cb)
 	dw Route24Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw Route24Script3
 	dw Route24Script4
@ -169,7 +169,7 @@ Route24Text1: ; 514a4 (14:54a4)
 	set 7, [hl]
 	ld hl, Route24Text_5152b
 	ld de, Route24Text_5152b
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ld a, [$ff8c]
 	ld [wSpriteIndex], a
 	call EngageMapTrainer
--- a/scripts/route25.asm
+++ b/scripts/route25.asm
@ -38,7 +38,7 @@ Route25Script_515e1: ; 515e1 (14:55e1)

 Route25ScriptPointers: ; 51622 (14:5622)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 Route25TextPointers: ; 51628 (14:5628)
--- a/scripts/route3.asm
+++ b/scripts/route3.asm
@ -9,7 +9,7 @@ Route3Script: ; 554f8 (15:54f8)

 Route3ScriptPointers: ; 5550b (15:550b)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 Route3TextPointers: ; 55511 (15:5511)
--- a/scripts/route4.asm
+++ b/scripts/route4.asm
@ -9,7 +9,7 @@ Route4Script: ; 55658 (15:5658)

 Route4ScriptPointers: ; 5566b (15:566b)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 Route4TextPointers: ; 55671 (15:5671)
--- a/scripts/route6.asm
+++ b/scripts/route6.asm
@ -9,7 +9,7 @@ Route6Script: ; 590b0 (16:50b0)

 Route6ScriptPointers: ; 590c3 (16:50c3)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 Route6TextPointers: ; 590c9 (16:50c9)
--- a/scripts/route8.asm
+++ b/scripts/route8.asm
@ -9,7 +9,7 @@ Route8Script: ; 591b6 (16:51b6)

 Route8ScriptPointers: ; 591c9 (16:51c9)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 Route8TextPointers: ; 591cf (16:51cf)
--- a/scripts/route9.asm
+++ b/scripts/route9.asm
@ -9,7 +9,7 @@ Route9Script: ; 556bc (15:56bc)

 Route9ScriptPointers: ; 556cf (15:56cf)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 Route9TextPointers: ; 556d5 (15:56d5)
--- a/scripts/saffrongym.asm
+++ b/scripts/saffrongym.asm
@ -31,7 +31,7 @@ SaffronGymText_5d048: ; 5d048 (17:5048)

 SaffronGymScriptPointers: ; 5d053 (17:5053)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw SaffronGymScript3

@ -178,7 +178,7 @@ SaffronGymText1: ; 5d118 (17:5118)
 	set 7, [hl]
 	ld hl, SaffronGymText_5d167
 	ld de, SaffronGymText_5d167
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ldh a, [$8c]
 	ld [wSpriteIndex], a
 	call EngageMapTrainer
--- a/scripts/silphco10.asm
+++ b/scripts/silphco10.asm
@ -22,7 +22,7 @@ SilphCo10Script_5a14f: ; 5a14f (16:614f)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $405
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock

 DataTable_5a173: ; 5a173 (16:6173)
 	db $04,$05,$FF
@ -37,7 +37,7 @@ SilphCo10Text_5a176: ; 5a176 (16:6176)

 SilphCo10ScriptPointers: ; 5a180 (16:6180)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 SilphCo10TextPointers: ; 5a186 (16:6186)
--- a/scripts/silphco11.asm
+++ b/scripts/silphco11.asm
@ -22,14 +22,14 @@ SilphCo11Script_62110: ; 62110 (18:6110)
 	ld a, $20
 	ld [wd09f], a
 	ld bc, $603
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock

 DataTable_62134: ; 62134 (18:6134)
 	db $06,$03,$FF

 SilphCo11Script_62137: ; 62137 (18:6137)
 	push hl
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	ld a, [hli]
 	ld b, a
 	ld a, [hl]
@ -53,7 +53,7 @@ SilphCo11Script_62137: ; 62137 (18:6137)
 	ld a, [hli]
 	cp c
 	jr nz, .asm_62143
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	xor a
 	ld [hli], a
 	ld [hl], a
@ -116,7 +116,7 @@ SilphCo11Script_621c8: ; 621c8 (18:61c8)

 SilphCo11ScriptPointers: ; 621cf (18:61cf)
 	dw SilphCo11Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw SilphCo11Script3
 	dw SilphCo11Script4
@ -221,7 +221,7 @@ SilphCo11Script4: ; 62293 (18:6293)
 	set 7, [hl]
 	ld hl, SilphCo10Text_62330 ; $6330
 	ld de, SilphCo10Text_62330 ; $6330
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c
 	ld [wSpriteIndex], a
 	call EngageMapTrainer
--- a/scripts/silphco2.asm
+++ b/scripts/silphco2.asm
@ -23,7 +23,7 @@ SilphCo2Script_59d07: ; 59d07 (16:5d07)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $0202
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	pop af
 .asm_59d2e
 	bit 6, a
@ -31,14 +31,14 @@ SilphCo2Script_59d07: ; 59d07 (16:5d07)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $0502
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock

 DataTable_59d3e: ; 59d3e (16:5d3e)
 	db $02,$02,$05,$02,$FF

 SilphCo2Script_59d43: ; 59d43 (16:5d43)
 	push hl
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	ld a, [hli]
 	ld b, a
 	ld a, [hl]
@ -62,7 +62,7 @@ SilphCo2Script_59d43: ; 59d43 (16:5d43)
 	ld a, [hli]
 	cp c
 	jr nz, .asm_59d4f
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	xor a
 	ld [hli], a
 	ld [hl], a
@ -87,7 +87,7 @@ SilphCo2Script_59d6f: ; 59d6f (16:5d6f)

 SilphCo2ScriptPointers: ; 59d80 (16:5d80)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 SilphCo2TextPointers: ; 59d86 (16:5d86)
--- a/scripts/silphco3.asm
+++ b/scripts/silphco3.asm
@ -23,7 +23,7 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $404
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	pop af
 .asm_59f98
 	bit 1, a
@ -31,7 +31,7 @@ SilphCo3Script_59f71: ; 59f71 (16:5f71)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $408
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock

 DataTable_59fa8: ; 59fa8 (16:5fa8)
 	db $04,$04,$04,$08,$FF
@ -51,7 +51,7 @@ SilphCo3Script_59fad: ; 59fad (16:5fad)

 SilphCo3ScriptPointers: ; 59fbe (16:5fbe)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 SilphCo3TextPointers: ; 59fc4 (16:5fc4)
--- a/scripts/silphco4.asm
+++ b/scripts/silphco4.asm
@ -23,7 +23,7 @@ SilphCo4Script_19d21: ; 19d21 (6:5d21)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $0602
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	pop af
 .asm_19d48
 	bit 1, a
@ -31,14 +31,14 @@ SilphCo4Script_19d21: ; 19d21 (6:5d21)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $0406
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock

 SilphCo4Data19d58: ; 19d58 (6:5d58)
 	db $06, $02, $04, $06, $ff

 SilphCo4Script_19d5d: ; 19d5d (6:5d5d)
 	push hl
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	ld a, [hli]
 	ld b, a
 	ld a, [hl]
@ -62,7 +62,7 @@ SilphCo4Script_19d5d: ; 19d5d (6:5d5d)
 	ld a, [hli]
 	cp c
 	jr nz, .asm_19d69 ; 0x19d7c $eb
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	xor a
 	ld [hli], a
 	ld [hl], a
@ -87,7 +87,7 @@ SilphCo4Script_19d89: ; 19d89 (6:5d89)

 SilphCo4ScriptPointers: ; 19d9a (6:5d9a)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 SilphCo4TextPointers: ; 19da0 (6:5da0)
--- a/scripts/silphco5.asm
+++ b/scripts/silphco5.asm
@ -23,7 +23,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $0203
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	pop af
 .asm_19f74
 	bit 1, a
@ -32,7 +32,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $0603
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	pop af
 .asm_19f87
 	bit 2, a
@ -40,7 +40,7 @@ SilphCo5Script_19f4d: ; 19f4d (6:5f4d)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $0507
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock

 SilphCo5Coords: ; 19f97 (6:5f97) ; coords?
 	db $02, $03, $06, $03, $05, $07, $ff
@ -65,7 +65,7 @@ SilphCo5Script_19f9e: ; 19f9e (6:5f9e)

 SilphCo5ScriptPointers: ; 19fb6 (6:5fb6)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 SilphCo5TextPointers: ; 19fbc (6:5fbc)
--- a/scripts/silphco6.asm
+++ b/scripts/silphco6.asm
@ -22,7 +22,7 @@ SilphCo6Script_1a1bf: ; 1a1bf (6:61bf)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $0602
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock

 SilphCo6Coords1: ; 1a1e3 (6:61e3)
 	db $06, $02
@ -38,7 +38,7 @@ SilphCo6Script_1a1e6: ; 1a1e6 (6:61e6)

 SilphCo6ScriptPointers: ; 1a1f0 (6:61f0)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 SilphCo6TextPointers: ; 1a1f6 (6:61f6)
--- a/scripts/silphco7.asm
+++ b/scripts/silphco7.asm
@ -23,7 +23,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $305
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	pop af
 .asm_51b9e
 	bit 5, a
@ -32,7 +32,7 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $20a
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	pop af
 .asm_51bb1
 	bit 6, a
@ -40,14 +40,14 @@ SilphCo7Script_51b77: ; 51b77 (14:5b77)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $60a
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock

 DataTable_51bc1: ; 51bc1 (14:5bc1)
 	db $03,$05,$02,$0A,$06,$0A,$FF

 SilphCo7Text_51bc8: ; 51bc8 (14:5bc8)
 	push hl
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	ld a, [hli]
 	ld b, a
 	ld a, [hl]
@ -71,7 +71,7 @@ SilphCo7Text_51bc8: ; 51bc8 (14:5bc8)
 	ld a, [hli]
 	cp c
 	jr nz, .asm_51bd4
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	xor a
 	ld [hli], a
 	ld [hl], a
@ -110,7 +110,7 @@ SilphCo7Text_51c10: ; 51c10 (14:5c10)

 SilphCo7ScriptPointers: ; 51c17 (14:5c17)
 	dw SilphCo7Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw SilphCo7Script3
 	dw SilphCo7Script4
@ -177,7 +177,7 @@ SilphCo7Script3: ; 51c82 (14:5c82)
 	set 7, [hl]
 	ld hl, SilphCo7Text14 ; $5ec8
 	ld de, SilphCo7Text_51ecd ; $5ecd
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ld a, SONY2 + $c8
 	ld [W_CUROPPONENT], a ; wd059
 	ld a, [W_RIVALSTARTER] ; wd715
--- a/scripts/silphco8.asm
+++ b/scripts/silphco8.asm
@ -22,14 +22,14 @@ SilphCo8Script_5651a: ; 5651a (15:651a)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $403
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock

 DataTable_5653e: ; 5653e (15:653e)
 	db $04,$03,$FF

 SilphCo8Script_56541: ; 56541 (15:6541)
 	push hl
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	ld a, [hli]
 	ld b, a
 	ld a, [hl]
@ -53,7 +53,7 @@ SilphCo8Script_56541: ; 56541 (15:6541)
 	ld a, [hli]
 	cp c
 	jr nz, .asm_5654d
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	xor a
 	ld [hli], a
 	ld [hl], a
@ -73,7 +73,7 @@ SilphCo8Script_5656d: ; 5656d (15:656d)

 SilphCo8ScriptPointers: ; 56577 (15:6577)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 SilphCo8TextPointers: ; 5657d (15:657d)
--- a/scripts/silphco9.asm
+++ b/scripts/silphco9.asm
@ -23,7 +23,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $401
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	pop af
 .asm_5d7f8
 	bit 1, a
@ -32,7 +32,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $209
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	pop af
 .asm_5d80b
 	bit 2, a
@ -41,7 +41,7 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1)
 	ld a, $54
 	ld [wd09f], a
 	ld bc, $509
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	pop af
 .asm_5d81e
 	bit 3, a
@ -49,14 +49,14 @@ SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1)
 	ld a, $5f
 	ld [wd09f], a
 	ld bc, $605
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock

 DataTable_5d82e: ; 5d82e (17:582e)
 	db $04,$01,$02,$09,$05,$09,$06,$05,$FF

 SilphCo9Script_5d837: ; 5d837 (17:5837)
 	push hl
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	ld a, [hli]
 	ld b, a
 	ld a, [hl]
@ -80,7 +80,7 @@ SilphCo9Script_5d837: ; 5d837 (17:5837)
 	ld a, [hli]
 	cp c
 	jr nz, .asm_5d843
-	ld hl, wd73f
+	ld hl, wCardKeyDoorY
 	xor a
 	ld [hli], a
 	ld [hl], a
@ -117,7 +117,7 @@ SilphCo9Script_5d863: ; 5d863 (17:5863)

 SilphCo9ScriptPointers: ; 5d885 (17:5885)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 SilphCo9TextPointers: ; 5d88b (17:588b)
--- a/scripts/ssanne10.asm
+++ b/scripts/ssanne10.asm
@ -9,7 +9,7 @@ SSAnne10Script: ; 61d55 (18:5d55)

 SSAnne10ScriptPointers: ; 61d68 (18:5d68)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 SSAnne10TextPointers: ; 61d6e (18:5d6e)
--- a/scripts/ssanne2.asm
+++ b/scripts/ssanne2.asm
@ -186,7 +186,7 @@ SSAnne2Text2: ; 614e6 (18:54e6)
 	set 7, [hl]
 	ld hl, SSAnneRivalDefeatedText
 	ld de, SSAnneRivalWonText
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	jp TextScriptEnd

 SSAnneRivalBeforeBattleText: ; 61500 (18:5500)
--- a/scripts/ssanne5.asm
+++ b/scripts/ssanne5.asm
@ -9,7 +9,7 @@ SSAnne5Script: ; 616ae (18:56ae)

 SSAnne5ScriptPointers: ; 616c1 (18:56c1)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 SSAnne5TextPointers: ; 616c7 (18:56c7)
--- a/scripts/ssanne8.asm
+++ b/scripts/ssanne8.asm
@ -9,7 +9,7 @@ SSAnne8Script: ; 61976 (18:5976)

 SSAnne8ScriptPointers: ; 61989 (18:5989)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 SSAnne8TextPointers: ; 6198f (18:598f)
--- a/scripts/ssanne9.asm
+++ b/scripts/ssanne9.asm
@ -12,7 +12,7 @@ SSAnne9Script: ; 61b4b (18:5b4b)

 SSAnne9ScriptPointers: ; 61b64 (18:5b64)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 SSAnne9TextPointers: ; 61b6a (18:5b6a)
--- a/scripts/unknowndungeon3.asm
+++ b/scripts/unknowndungeon3.asm
@ -9,7 +9,7 @@ UnknownDungeon3Script: ; 45ef0 (11:5ef0)

 UnknownDungeon3ScriptPointers: ; 45f03 (11:5f03)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 UnknownDungeon3TextPointers: ; 45f09 (11:5f09)
--- a/scripts/vermiliondock.asm
+++ b/scripts/vermiliondock.asm
@ -66,7 +66,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b)
 	ld [$ff49], a
 	ld a, $58
 	ld [wTrainerEngageDistance], a
-	ld hl, wd526
+	ld hl, wMapViewVRAMPointer
 	ld c, [hl]
 	inc hl
 	ld b, [hl]
@ -82,9 +82,9 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b)
 	ld hl, $0002
 	add hl, bc
 	ld a, l
-	ld [wd526], a
+	ld [wMapViewVRAMPointer], a
 	ld a, h
-	ld [wd527], a
+	ld [wMapViewVRAMPointer + 1], a
 	push hl
 	push de
 	call ScheduleEastColumnRedraw
--- a/scripts/vermiliongym.asm
+++ b/scripts/vermiliongym.asm
@ -40,7 +40,7 @@ VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d)
 .asm_5ca7f
 	ld [wd09f], a
 	ld bc, $202
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock

 VermilionGymScript_5ca8a: ; 5ca8a (17:4a8a)
 	xor a
@ -51,7 +51,7 @@ VermilionGymScript_5ca8a: ; 5ca8a (17:4a8a)

 VermilionGymScriptPointers: ; 5ca95 (17:4a95)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw VermilionGymScript3

@ -156,7 +156,7 @@ VermilionGymText1: ; 5cb1d (17:4b1d)
 	set 7, [hl]
 	ld hl, ReceivedThunderbadgeText
 	ld de, ReceivedThunderbadgeText
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ldh a, [$8c]
 	ld [wSpriteIndex], a
 	call EngageMapTrainer
--- a/scripts/victoryroad1.asm
+++ b/scripts/victoryroad1.asm
@ -17,11 +17,11 @@ VictoryRoad1Script: ; 5da0a (17:5a0a)
 	ld a, $1d
 	ld [wd09f], a
 	ld bc, $604
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock

 VictoryRoad1ScriptPointers: ; 5da3a (17:5a3a)
 	dw VictoryRoad1Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 VictoryRoad1Script0: ; 5da40 (17:5a40)
--- a/scripts/victoryroad2.asm
+++ b/scripts/victoryroad2.asm
@ -36,12 +36,12 @@ VictoryRoad2Script_517c9: ; 517c9 (14:57c9)

 VictoryRoad2Script_517e2: ; 517e2 (14:57e2)
 	ld [wd09f], a
-	predef Func_ee9e
+	predef ReplaceTileBlock
 	ret

 VictoryRoad2ScriptPointers: ; 517eb (14:57eb)
 	dw VictoryRoad2Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 VictoryRoad2Script0: ; 517f1 (14:57f1)
--- a/scripts/victoryroad3.asm
+++ b/scripts/victoryroad3.asm
@ -19,11 +19,11 @@ VictoryRoad3Script_44996: ; 44996 (11:4996)
 	ld a, $1d
 	ld [wd09f], a
 	ld bc, $503
-	predef_jump Func_ee9e
+	predef_jump ReplaceTileBlock

 VictoryRoad3ScriptPointers: ; 449b1 (11:49b1)
 	dw VictoryRoad3Script0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 VictoryRoad3Script0: ; 449b7 (11:49b7)
--- a/scripts/viridianforest.asm
+++ b/scripts/viridianforest.asm
@ -9,7 +9,7 @@ ViridianForestScript: ; 6110d (18:510d)

 ViridianForestScriptPointers: ; 61120 (18:5120)
 	dw CheckFightingMapTrainers
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle

 ViridianForestTextPointers: ; 61126 (18:5126)
--- a/scripts/viridiangym.asm
+++ b/scripts/viridiangym.asm
@ -24,7 +24,7 @@ ViridianGymScript_748d6: ; 748d6 (1d:48d6)

 ViridianGymScriptPointers: ; 748e1 (1d:48e1)
 	dw ViridianGymScript0
-	dw Func_324c
+	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 	dw ViridianGymScript3
 	dw ViridianGymScript4
@ -35,7 +35,7 @@ ViridianGymScript0: ; 748eb (1d:48eb)
 	ld a, [W_XCOORD] ; wd362
 	ld c, a
 	ld hl, ViridianGymArrowTilePlayerMovement
-	call Func_3442
+	call DecodeArrowMovementRLE
 	cp $ff
 	jp z, CheckFightingMapTrainers
 	call StartSimulatingJoypadStates
@ -305,7 +305,7 @@ ViridianGymText1: ; 74a69 (1d:4a69)
 	set 7, [hl]
 	ld hl, ViridianGymText_74ad3
 	ld de, ViridianGymText_74ad3
-	call PreBattleSaveRegisters
+	call SaveEndBattleTextPointers
 	ldh a, [$8c]
 	ld [wSpriteIndex], a
 	call EngageMapTrainer