256 files changed, 1676 insertions, 1734 deletions

diff --git a/scripts/agatha.asm b/scripts/AgathasRoom.asm
index 6f611071..20245166 100755
--- a/scripts/agatha.asm
+++ b/scripts/AgathasRoom.asm
@@ -1,11 +1,11 @@
-AgathaScript:
+AgathasRoom_Script:
 	call AgathaShowOrHideExitBlock
 	call EnableAutoTextBoxDrawing
-	ld hl, AgathaTrainerHeaders
-	ld de, AgathaScriptPointers
-	ld a, [wAgathaCurScript]
+	ld hl, AgathaTrainerHeader0
+	ld de, AgathasRoom_ScriptPointers
+	ld a, [wAgathasRoomCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wAgathaCurScript], a
+	ld [wAgathasRoomCurScript], a
 	ret
 
 AgathaShowOrHideExitBlock:
@@ -28,10 +28,10 @@ AgathaShowOrHideExitBlock:
 
 ResetAgathaScript:
 	xor a
-	ld [wAgathaCurScript], a
+	ld [wAgathasRoomCurScript], a
 	ret
 
-AgathaScriptPointers:
+AgathasRoom_ScriptPointers:
 	dw AgathaScript0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw AgathaScript2
@@ -55,7 +55,7 @@ AgathaScriptWalkIntoRoom:
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
 	ld a, $3
-	ld [wAgathaCurScript], a
+	ld [wAgathasRoomCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -83,7 +83,7 @@ AgathaScript0:
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
 	ld a, $3
-	ld [wAgathaCurScript], a
+	ld [wAgathasRoomCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -101,7 +101,7 @@ AgathaScript3:
 	call Delay3
 	xor a
 	ld [wJoyIgnore], a
-	ld [wAgathaCurScript], a
+	ld [wAgathasRoomCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -114,14 +114,13 @@ AgathaScript2:
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, $1
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
-AgathaTextPointers:
+AgathasRoom_TextPointers:
 	dw AgathaText1
 	dw AgathaDontRunAwayText
 
-AgathaTrainerHeaders:
 AgathaTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_AGATHAS_ROOM_TRAINER_0
 	db ($0 << 4) ; trainer's view range
diff --git a/scripts/beach_house.asm b/scripts/BeachHouse.asm
index 38f6fc7f..6a67c7ab 100644
--- a/scripts/beach_house.asm
+++ b/scripts/BeachHouse.asm
@@ -1,8 +1,8 @@
-BeachHouseScript:
+BeachHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-BeachHouseTextPointers:
+BeachHouse_TextPointers:
 	dw SurfinDudeText
 	dw BeachHousePikachuText
 	dw BeachHouseSign1Text
diff --git a/scripts/beach_house2.asm b/scripts/BeachHouse2.asm
index 03e77ecb..a5b7e7be 100755
--- a/scripts/beach_house2.asm
+++ b/scripts/BeachHouse2.asm
@@ -24,10 +24,10 @@ Func_f23d0:
 
 Text_f240c:
 	TX_FAR _BeachHousePrinterText5
-	TX_WAIT_BUTTON
+	TX_WAIT
 	db "@"
 
 Text_f2412:
 	TX_FAR _BeachHousePrinterText6
-	TX_WAIT_BUTTON
+	TX_WAIT
 	db "@"
diff --git a/scripts/bikeshop.asm b/scripts/BikeShop.asm
index 5ebd1fb6..a554cf7c 100755
--- a/scripts/bikeshop.asm
+++ b/scripts/BikeShop.asm
@@ -1,8 +1,8 @@
-BikeShopScript:
+BikeShop_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-BikeShopTextPointers:
+BikeShop_TextPointers:
 	dw BikeShopText1
 	dw BikeShopText2
 	dw BikeShopText3
diff --git a/scripts/billshouse.asm b/scripts/BillsHouse.asm
index 3e13ba51..a9e09947 100755
--- a/scripts/billshouse.asm
+++ b/scripts/BillsHouse.asm
@@ -1,12 +1,12 @@
-BillsHouseScript:
+BillsHouse_Script:
 	call BillsHouseScript_1e09e
 	call EnableAutoTextBoxDrawing
 	ld a, [wBillsHouseCurScript]
-	ld hl, BillsHouseScriptPointers
-	call JumpTable
+	ld hl, BillsHouse_ScriptPointers
+	call CallFunctionInTable
 	ret
 
-BillsHouseScriptPointers:
+BillsHouse_ScriptPointers:
 	dw BillsHouseScript0
 	dw BillsHouseScript1
 	dw BillsHouseScript2
@@ -253,7 +253,7 @@ BillsHouseScript8:
 BillsHouseScript9:
 	ret
 
-BillsHouseTextPointers:
+BillsHouse_TextPointers:
 	dw BillsHouseText1
 	dw BillsHouseText2
 	dw BillsHouseText3
diff --git a/scripts/billshouse2.asm b/scripts/BillsHouse2.asm
index 9d3b4364..ce474004 100755
--- a/scripts/billshouse2.asm
+++ b/scripts/BillsHouse2.asm
@@ -63,7 +63,7 @@ BillsHouseText_f248c:
 BillsHouseText_f2491:
 	TX_FAR _SSTicketReceivedText
 	TX_SFX_KEY_ITEM
-	TX_BUTTON_SOUND
+	TX_BLINK
 	db "@"
 
 BillsHouseText_f2498:
diff --git a/scripts/blueshouse.asm b/scripts/BluesHouse.asm
index b727bbd1..471e6989 100755
--- a/scripts/blueshouse.asm
+++ b/scripts/BluesHouse.asm
@@ -1,11 +1,11 @@
-BluesHouseScript:
+BluesHouse_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, BluesHouseScriptPointers
+	ld hl, BluesHouse_ScriptPointers
 	xor a
-	call JumpTable
+	call CallFunctionInTable
 	ret
 
-BluesHouseScriptPointers:
+BluesHouse_ScriptPointers:
 	dw BluesHouseScript0
 	dw BluesHouseScript1
 
@@ -18,7 +18,7 @@ BluesHouseScript0:
 BluesHouseScript1:
 	ret
 
-BluesHouseTextPointers:
+BluesHouse_TextPointers:
 	dw BluesHouseText1
 	dw BluesHouseText2
 	dw BluesHouseText3
diff --git a/scripts/bruno.asm b/scripts/BrunosRoom.asm
index a10a1e49..a525e5bb 100755
--- a/scripts/bruno.asm
+++ b/scripts/BrunosRoom.asm
@@ -1,11 +1,11 @@
-BrunoScript:
+BrunosRoom_Script:
 	call BrunoShowOrHideExitBlock
 	call EnableAutoTextBoxDrawing
-	ld hl, BrunoTrainerHeaders
-	ld de, BrunoScriptPointers
-	ld a, [wBrunoCurScript]
+	ld hl, BrunoTrainerHeader0
+	ld de, BrunosRoom_ScriptPointers
+	ld a, [wBrunosRoomCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wBrunoCurScript], a
+	ld [wBrunosRoomCurScript], a
 	ret
 
 BrunoShowOrHideExitBlock:
@@ -28,10 +28,10 @@ BrunoShowOrHideExitBlock:
 
 ResetBrunoScript:
 	xor a
-	ld [wBrunoCurScript], a
+	ld [wBrunosRoomCurScript], a
 	ret
 
-BrunoScriptPointers:
+BrunosRoom_ScriptPointers:
 	dw BrunoScript0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw BrunoScript2
@@ -55,7 +55,7 @@ BrunoScriptWalkIntoRoom:
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
 	ld a, $3
-	ld [wBrunoCurScript], a
+	ld [wBrunosRoomCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -83,7 +83,7 @@ BrunoScript0:
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
 	ld a, $3
-	ld [wBrunoCurScript], a
+	ld [wBrunosRoomCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -101,7 +101,7 @@ BrunoScript3:
 	call Delay3
 	xor a
 	ld [wJoyIgnore], a
-	ld [wBrunoCurScript], a
+	ld [wBrunosRoomCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -114,11 +114,10 @@ BrunoScript2:
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-BrunoTextPointers:
+BrunosRoom_TextPointers:
 	dw BrunoText1
 	dw BrunoDontRunAwayText
 
-BrunoTrainerHeaders:
 BrunoTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_BRUNOS_ROOM_TRAINER_0
 	db ($0 << 4) ; trainer's view range
diff --git a/scripts/celadonhouse.asm b/scripts/CeladonChiefHouse.asm
index 7f2778d1..fc37bd4d 100755
--- a/scripts/celadonhouse.asm
+++ b/scripts/CeladonChiefHouse.asm
@@ -1,8 +1,8 @@
-CeladonHouseScript:
+CeladonChiefHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-CeladonHouseTextPointers:
+CeladonChiefHouse_TextPointers:
 	dw CeladonHouseText1
 	dw CeladonHouseText2
 	dw CeladonHouseText3
diff --git a/scripts/celadoncity.asm b/scripts/CeladonCity.asm
index 04fa0a28..bd49f5af 100755
--- a/scripts/celadoncity.asm
+++ b/scripts/CeladonCity.asm
@@ -1,11 +1,11 @@
-CeladonCityScript:
+CeladonCity_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, CeladonCityScriptPointers
+	ld hl, CeladonCity_ScriptPointers
 	ld a, [wCeladonCityCurScript]
-	call JumpTable
+	call CallFunctionInTable
 	ret
 
-CeladonCityScriptPointers:
+CeladonCity_ScriptPointers:
 	dw CeladonCityScript1
 
 CeladonCityScript1:
@@ -13,7 +13,7 @@ CeladonCityScript1:
 	ResetEvent EVENT_67F
 	ret
 
-CeladonCityTextPointers:
+CeladonCity_TextPointers:
 	dw CeladonCityText1
 	dw CeladonCityText2
 	dw CeladonCityText3
@@ -78,7 +78,8 @@ TM41PreText:
 
 ReceivedTM41Text:
 	TX_FAR _ReceivedTM41Text
-	db $0B, "@"
+	TX_SFX_ITEM_1
+	db "@"
 
 TM41ExplanationText:
 	TX_FAR _TM41ExplanationText
diff --git a/scripts/celadoncity2.asm b/scripts/CeladonCity2.asm
index 12f7b366..12f7b366 100755
--- a/scripts/celadoncity2.asm
+++ b/scripts/CeladonCity2.asm
diff --git a/scripts/celadondiner.asm b/scripts/CeladonDiner.asm
index 6ecada9e..f444ec15 100755
--- a/scripts/celadondiner.asm
+++ b/scripts/CeladonDiner.asm
@@ -1,8 +1,8 @@
-CeladonDinerScript:
+CeladonDiner_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-CeladonDinerTextPointers:
+CeladonDiner_TextPointers:
 	dw CeladonDinerText1
 	dw CeladonDinerText2
 	dw CeladonDinerText3
diff --git a/scripts/celadondiner2.asm b/scripts/CeladonDiner2.asm
index 8cd66a19..8cd66a19 100755
--- a/scripts/celadondiner2.asm
+++ b/scripts/CeladonDiner2.asm
diff --git a/scripts/celadongym.asm b/scripts/CeladonGym.asm
index 762806f2..50c02196 100755
--- a/scripts/celadongym.asm
+++ b/scripts/CeladonGym.asm
@@ -1,11 +1,11 @@
-CeladonGymScript:
+CeladonGym_Script:
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
 	call nz, CeladonGymScript_48927
 	call EnableAutoTextBoxDrawing
-	ld hl, CeladonGymTrainerHeaders
-	ld de, CeladonGymScriptPointers
+	ld hl, CeladonGymTrainerHeader0
+	ld de, CeladonGym_ScriptPointers
 	ld a, [wCeladonGymCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wCeladonGymCurScript], a
@@ -29,7 +29,7 @@ CeladonGymText_48943:
 	ld [wCurMapScript], a
 	ret
 
-CeladonGymScriptPointers:
+CeladonGym_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -66,11 +66,11 @@ CeladonGymText_48963:
 	set 3, [hl]
 
 	; deactivate gym trainers
-	SetEventRange EVENT_BEAT_CELADON_GYM_TRAINER_0, EVENT_BEAT_CELADON_GYM_TRAINER_7
+	SetEventRange EVENT_BEAT_CELADON_GYM_TRAINER_0, EVENT_BEAT_CELADON_GYM_TRAINER_6
 
 	jp CeladonGymText_48943
 
-CeladonGymTextPointers:
+CeladonGym_TextPointers:
 	dw CeladonGymText1
 	dw CeladonGymText2
 	dw CeladonGymText3
@@ -83,7 +83,6 @@ CeladonGymTextPointers:
 	dw TM21Text
 	dw TM21NoRoomText
 
-CeladonGymTrainerHeaders:
 CeladonGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_0
 	db ($2 << 4) ; trainer's view range
@@ -93,55 +92,55 @@ CeladonGymTrainerHeader0:
 	dw CeladonGymEndBattleText2 ; TextEndBattle
 	dw CeladonGymEndBattleText2 ; TextEndBattle
 
-CeladonGymTrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_2
+CeladonGymTrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_1
 	dw CeladonGymBattleText3 ; TextBeforeBattle
 	dw CeladonGymAfterBattleText3 ; TextAfterBattle
 	dw CeladonGymEndBattleText3 ; TextEndBattle
 	dw CeladonGymEndBattleText3 ; TextEndBattle
 
-CeladonGymTrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_3
+CeladonGymTrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_2
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_2
 	dw CeladonGymBattleText4 ; TextBeforeBattle
 	dw CeladonGymAfterBattleText4 ; TextAfterBattle
 	dw CeladonGymEndBattleText4 ; TextEndBattle
 	dw CeladonGymEndBattleText4 ; TextEndBattle
 
-CeladonGymTrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_4
+CeladonGymTrainerHeader3:
+	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_3
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_3
 	dw CeladonGymBattleText5 ; TextBeforeBattle
 	dw CeladonGymAfterBattleText5 ; TextAfterBattle
 	dw CeladonGymEndBattleText5 ; TextEndBattle
 	dw CeladonGymEndBattleText5 ; TextEndBattle
 
-CeladonGymTrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_5
+CeladonGymTrainerHeader4:
+	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_4
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_4
 	dw CeladonGymBattleText6 ; TextBeforeBattle
 	dw CeladonGymAfterBattleText6 ; TextAfterBattle
 	dw CeladonGymEndBattleText6 ; TextEndBattle
 	dw CeladonGymEndBattleText6 ; TextEndBattle
 
-CeladonGymTrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_6
+CeladonGymTrainerHeader5:
+	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_5
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_5
 	dw CeladonGymBattleText7 ; TextBeforeBattle
 	dw CeladonGymAfterBattleText7 ; TextAfterBattle
 	dw CeladonGymEndBattleText7 ; TextEndBattle
 	dw CeladonGymEndBattleText7 ; TextEndBattle
 
-CeladonGymTrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_7, 1
+CeladonGymTrainerHeader6:
+	dbEventFlagBit EVENT_BEAT_CELADON_GYM_TRAINER_6, 1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_7, 1
+	dwEventFlagAddress EVENT_BEAT_CELADON_GYM_TRAINER_6, 1
 	dw CeladonGymBattleText8 ; TextBeforeBattle
 	dw CeladonGymAfterBattleText8 ; TextAfterBattle
 	dw CeladonGymEndBattleText8 ; TextEndBattle
@@ -201,7 +200,7 @@ CeladonGymText9:
 
 TM21Text:
 	TX_FAR _ReceivedTM21Text
-	db $0B
+	TX_SFX_ITEM_1
 	TX_FAR _TM21ExplanationText
 	db "@"
 
@@ -229,7 +228,7 @@ CeladonGymAfterBattleText2:
 
 CeladonGymText3:
 	TX_ASM
-	ld hl, CeladonGymTrainerHeader2
+	ld hl, CeladonGymTrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -247,7 +246,7 @@ CeladonGymAfterBattleText3:
 
 CeladonGymText4:
 	TX_ASM
-	ld hl, CeladonGymTrainerHeader3
+	ld hl, CeladonGymTrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -265,7 +264,7 @@ CeladonGymAfterBattleText4:
 
 CeladonGymText5:
 	TX_ASM
-	ld hl, CeladonGymTrainerHeader4
+	ld hl, CeladonGymTrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -283,7 +282,7 @@ CeladonGymAfterBattleText5:
 
 CeladonGymText6:
 	TX_ASM
-	ld hl, CeladonGymTrainerHeader5
+	ld hl, CeladonGymTrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -301,7 +300,7 @@ CeladonGymAfterBattleText6:
 
 CeladonGymText7:
 	TX_ASM
-	ld hl, CeladonGymTrainerHeader6
+	ld hl, CeladonGymTrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -319,7 +318,7 @@ CeladonGymAfterBattleText7:
 
 CeladonGymText8:
 	TX_ASM
-	ld hl, CeladonGymTrainerHeader7
+	ld hl, CeladonGymTrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
diff --git a/scripts/celadonhotel.asm b/scripts/CeladonHotel.asm
index 23b9eb55..ee4e140c 100755
--- a/scripts/celadonhotel.asm
+++ b/scripts/CeladonHotel.asm
@@ -1,7 +1,7 @@
-CeladonHotelScript:
+CeladonHotel_Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonHotelTextPointers:
+CeladonHotel_TextPointers:
 	dw CeladonHotelText1
 	dw CeladonHotelText2
 	dw CeladonHotelText3
diff --git a/scripts/celadonmansion1.asm b/scripts/CeladonMansion1F.asm
index 59d9d1d8..1d7c37b4 100755
--- a/scripts/celadonmansion1.asm
+++ b/scripts/CeladonMansion1F.asm
@@ -1,8 +1,8 @@
-CeladonMansion1Script:
+CeladonMansion1F_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-CeladonMansion1TextPointers:
+CeladonMansion1F_TextPointers:
 	dw CeladonMansion1Text1
 	dw CeladonMansion1Text2
 	dw CeladonMansion1Text3
diff --git a/scripts/celadonmansion1_2.asm b/scripts/CeladonMansion1F_2.asm
index 0e1c2389..cdd56ab8 100755
--- a/scripts/celadonmansion1_2.asm
+++ b/scripts/CeladonMansion1F_2.asm
@@ -15,12 +15,12 @@ Func_f1e70:
 
 CeladonMansion1Text_f1e96:
 	TX_FAR _CeladonMansion1Text2
-	TX_WAIT_BUTTON
+	TX_WAIT
 	db "@"
 
 CeladonMansionText_f1e9c:
 	TX_FAR _CeladonMansion1Text6
-	TX_BUTTON_SOUND
+	TX_BLINK
 	db "@"
 
 Func_f1ea2:
diff --git a/scripts/celadonmansion2.asm b/scripts/CeladonMansion2F.asm
index 520615d4..9deb606d 100755
--- a/scripts/celadonmansion2.asm
+++ b/scripts/CeladonMansion2F.asm
@@ -1,8 +1,8 @@
-CeladonMansion2Script:
+CeladonMansion2F_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-CeladonMansion2TextPointers:
+CeladonMansion2F_TextPointers:
 	dw CeladonMansion2Text1
 
 CeladonMansion2Text1:
diff --git a/scripts/celadonmansion3.asm b/scripts/CeladonMansion3F.asm
index 6693f6a6..64a8343b 100755
--- a/scripts/celadonmansion3.asm
+++ b/scripts/CeladonMansion3F.asm
@@ -1,4 +1,4 @@
-CeladonMansion3Script:
+CeladonMansion3F_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
@@ -9,7 +9,7 @@ CeladonMansion3_PokedexCount:
 	ld a, [wNumSetBits]
 	ret
 
-CeladonMansion3TextPointers:
+CeladonMansion3F_TextPointers:
 	dw ProgrammerText
 	dw GraphicArtistText
 	dw WriterText
@@ -144,7 +144,7 @@ DirectorText:
 
 .CompletedDexText
 	TX_FAR _CompletedDexText
-	TX_BUTTON_SOUND
+	TX_BLINK
 	TX_ASM
 	callab DisplayDiploma
 	ld a, $1
diff --git a/scripts/celadonmansion3_2.asm b/scripts/CeladonMansion3F_2.asm
index 3a7035ba..3a7035ba 100755
--- a/scripts/celadonmansion3_2.asm
+++ b/scripts/CeladonMansion3F_2.asm
diff --git a/scripts/celadonmansion4.asm b/scripts/CeladonMansionRoof.asm
index 483aa4fd..1813e9ee 100755
--- a/scripts/celadonmansion4.asm
+++ b/scripts/CeladonMansionRoof.asm
@@ -1,8 +1,8 @@
-CeladonMansion4Script:
+CeladonMansionRoof_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-CeladonMansion4TextPointers:
+CeladonMansionRoof_TextPointers:
 	dw CeladonMansion4Text1
 
 CeladonMansion4Text1:
diff --git a/scripts/celadonmansion5.asm b/scripts/CeladonMansionRoofHouse.asm
index c2da8c6d..8e485352 100755
--- a/scripts/celadonmansion5.asm
+++ b/scripts/CeladonMansionRoofHouse.asm
@@ -1,8 +1,8 @@
-CeladonMansion5Script:
+CeladonMansionRoofHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-CeladonMansion5TextPointers:
+CeladonMansionRoofHouse_TextPointers:
 	dw CeladonMansion5Text1
 	dw CeladonMansion5Text2
 
@@ -15,7 +15,7 @@ CeladonMansion5Text2:
 	lb bc, EEVEE, 25
 	call GivePokemon
 	jr nc, .asm_24365
-	ld a, HS_CELADON_MANSION_5_GIFT
+	ld a, HS_CELADON_MANSION_EEVEE_GIFT
 	ld [wMissableObjectIndex], a
 	predef HideObject
 .asm_24365
diff --git a/scripts/celadonmart1.asm b/scripts/CeladonMart1F.asm
index 64c4a087..e84eaae0 100755
--- a/scripts/celadonmart1.asm
+++ b/scripts/CeladonMart1F.asm
@@ -1,8 +1,8 @@
-CeladonMart1Script:
+CeladonMart1F_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-CeladonMart1TextPointers:
+CeladonMart1F_TextPointers:
 	dw CeladonMart1Text1
 	dw CeladonMart1Text2
 	dw CeladonMart1Text3
diff --git a/scripts/celadonmart2.asm b/scripts/CeladonMart2F.asm
index c438d6e1..787c186e 100755
--- a/scripts/celadonmart2.asm
+++ b/scripts/CeladonMart2F.asm
@@ -1,7 +1,7 @@
-CeladonMart2Script:
+CeladonMart2F_Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonMart2TextPointers:
+CeladonMart2F_TextPointers:
 	dw CeladonMart2Clerk1Text
 	dw CeladonMart2Clerk2Text
 	dw CeladonMart2Text3
diff --git a/scripts/celadonmart3.asm b/scripts/CeladonMart3F.asm
index 25bf4e80..c8a108d7 100755
--- a/scripts/celadonmart3.asm
+++ b/scripts/CeladonMart3F.asm
@@ -1,7 +1,7 @@
-CeladonMart3Script:
+CeladonMart3F_Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonMart3TextPointers:
+CeladonMart3F_TextPointers:
 	dw CeladonMart3Text1
 	dw CeladonMart3Text2
 	dw CeladonMart3Text3
diff --git a/scripts/celadonmart3_2.asm b/scripts/CeladonMart3F_2.asm
index 1c9f0db1..8c99e0e0 100755
--- a/scripts/celadonmart3_2.asm
+++ b/scripts/CeladonMart3F_2.asm
@@ -26,7 +26,7 @@ CeladonMart3Text_f1e5b:
 
 CeladonMart3Text_f1e60:
 	TX_FAR _ReceivedTM18Text
-	TX_SFX_ITEM
+	TX_SFX_ITEM_1
 	db "@"
 
 CeladonMart3Text_f1e66:
diff --git a/scripts/celadonmart4.asm b/scripts/CeladonMart4F.asm
index 18049dc0..20f817e9 100755
--- a/scripts/celadonmart4.asm
+++ b/scripts/CeladonMart4F.asm
@@ -1,7 +1,7 @@
-CeladonMart4Script:
+CeladonMart4F_Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonMart4TextPointers:
+CeladonMart4F_TextPointers:
 	dw CeladonMart4ClerkText
 	dw CeladonMart4Text2
 	dw CeladonMart4Text3
diff --git a/scripts/celadonmart5.asm b/scripts/CeladonMart5F.asm
index f65b42bc..74c590be 100755
--- a/scripts/celadonmart5.asm
+++ b/scripts/CeladonMart5F.asm
@@ -1,8 +1,8 @@
-CeladonMart5Script:
+CeladonMart5F_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-CeladonMart5TextPointers:
+CeladonMart5F_TextPointers:
 	dw CeladonMart5Text1
 	dw CeladonMart5Text2
 	dw CeladonMart5Clerk1Text
diff --git a/scripts/celadonmartelevator.asm b/scripts/CeladonMartElevator.asm
index 60e5210c..34b923f9 100755
--- a/scripts/celadonmartelevator.asm
+++ b/scripts/CeladonMartElevator.asm
@@ -1,4 +1,4 @@
-CeladonMartElevatorScript:
+CeladonMartElevator_Script:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -52,17 +52,17 @@ CeladonMartElevatorWarpMaps:
 ; first byte is warp number
 ; second byte is map number
 ; These specify where the player goes after getting out of the elevator.
-	db $05, CELADON_MART_1
-	db $02, CELADON_MART_2
-	db $02, CELADON_MART_3
-	db $02, CELADON_MART_4
-	db $02, CELADON_MART_5
+	db $05, CELADON_MART_1F
+	db $02, CELADON_MART_2F
+	db $02, CELADON_MART_3F
+	db $02, CELADON_MART_4F
+	db $02, CELADON_MART_5F
 CeladonMartElevatorWarpMapsEnd:
 
 CeladonMartElevatorScript_48654:
 	jpba ShakeElevator
 
-CeladonMartElevatorTextPointers:
+CeladonMartElevator_TextPointers:
 	dw CeladonMartElevatorText1
 
 CeladonMartElevatorText1:
diff --git a/scripts/celadonmartroof.asm b/scripts/CeladonMartRoof.asm
index 22a83780..64871bdd 100755
--- a/scripts/celadonmartroof.asm
+++ b/scripts/CeladonMartRoof.asm
@@ -1,4 +1,4 @@
-CeladonMartRoofScript:
+CeladonMartRoof_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
@@ -143,48 +143,48 @@ CeladonMartRoofText_484ee:
 
 CeladonMartRoofText_484f3:
 	TX_FAR _CeladonMartRoofText_484f3
-	db $0d
+	TX_WAIT
 	db "@"
 
 CeladonMartRoofText_484f9:
 	TX_FAR _CeladonMartRoofText_484f9
-	db $0b
+	TX_SFX_ITEM_1
 	TX_FAR _CeladonMartRoofText_484fe
-	db $0d
+	TX_WAIT
 	db "@"
 
 CeladonMartRoofText_48504:
 	TX_FAR _CeladonMartRoofText_48504
-	db $0d
+	TX_WAIT
 	db "@"
 
 CeladonMartRoofText_4850a:
 	TX_FAR _CeladonMartRoofText_4850a
-	db $0b
+	TX_SFX_ITEM_1
 	TX_FAR _CeladonMartRoofText_4850f
-	db $0d
+	TX_WAIT
 	db "@"
 
 CeladonMartRoofText_48515:
 	TX_FAR _CeladonMartRoofText_48515
-	db $0d
+	TX_WAIT
 	db "@"
 
 ReceivedTM49Text:
 	TX_FAR _ReceivedTM49Text
-	db $0b
+	TX_SFX_ITEM_1
 	TX_FAR _CeladonMartRoofText_48520
-	db $0d
+	TX_WAIT
 	db "@"
 
 CeladonMartRoofText_48526:
 	TX_FAR _CeladonMartRoofText_48526
-	db $0d
+	TX_WAIT
 	db "@"
 
 CeladonMartRoofText_4852c:
 	TX_FAR _CeladonMartRoofText_4852c
-	db $0d
+	TX_WAIT
 	db "@"
 
 CeladonMartRoofScript_PrintDrinksInBag:
@@ -209,7 +209,7 @@ CeladonMartRoofScript_PrintDrinksInBag:
 	pop hl
 	jr .loop
 
-CeladonMartRoofTextPointers:
+CeladonMartRoof_TextPointers:
 	dw CeladonMartRoofText1
 	dw CeladonMartRoofText2
 	dw CeladonMartRoofText5
diff --git a/scripts/celadonpokecenter.asm b/scripts/CeladonPokecenter.asm
index acbae2ec..21b9452c 100755
--- a/scripts/celadonpokecenter.asm
+++ b/scripts/CeladonPokecenter.asm
@@ -1,8 +1,8 @@
-CeladonPokecenterScript:
+CeladonPokecenter_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-CeladonPokecenterTextPointers:
+CeladonPokecenter_TextPointers:
 	dw CeladonHealNurseText
 	dw CeladonPokecenterText2
 	dw CeladonPokecenterText3
diff --git a/scripts/ceruleanhouse2.asm b/scripts/CeruleanBadgeHouse.asm
index e83c2194..cab2bf23 100755
--- a/scripts/ceruleanhouse2.asm
+++ b/scripts/CeruleanBadgeHouse.asm
@@ -1,11 +1,11 @@
-CeruleanHouse2Script:
+CeruleanBadgeHouse_Script:
 	ld a, $1
 	ld [wAutoTextBoxDrawingControl], a
 	dec a
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ret
 
-CeruleanHouse2TextPointers:
+CeruleanBadgeHouse_TextPointers:
 	dw CeruleanHouse2Text1
 
 CeruleanHouse2Text1:
diff --git a/scripts/unknowndungeon1.asm b/scripts/CeruleanCave1F.asm
index 3b5fae5d..e2803587 100755
--- a/scripts/unknowndungeon1.asm
+++ b/scripts/CeruleanCave1F.asm
@@ -1,7 +1,7 @@
-UnknownDungeon1Script:
+CeruleanCave1F_Script:
 	jp EnableAutoTextBoxDrawing
 
-UnknownDungeon1TextPointers:
+CeruleanCave1F_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 	dw PickUpItemText
diff --git a/scripts/unknowndungeon2.asm b/scripts/CeruleanCave2F.asm
index 55ebb752..e6a70082 100755
--- a/scripts/unknowndungeon2.asm
+++ b/scripts/CeruleanCave2F.asm
@@ -1,7 +1,7 @@
-UnknownDungeon2Script:
+CeruleanCave2F_Script:
 	jp EnableAutoTextBoxDrawing
 
-UnknownDungeon2TextPointers:
+CeruleanCave2F_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 	dw PickUpItemText
diff --git a/scripts/unknowndungeon3.asm b/scripts/CeruleanCaveB1F.asm
index 46a1cafd..b98ca4ba 100755
--- a/scripts/unknowndungeon3.asm
+++ b/scripts/CeruleanCaveB1F.asm
@@ -1,25 +1,24 @@
-UnknownDungeon3Script:
+CeruleanCaveB1F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, UnknownDungeon3TrainerHeaders
-	ld de, .ScriptPointers
-	ld a, [wUnknownDungeon3CurScript]
+	ld hl, MewtwoTrainerHeader
+	ld de, CeruleanCaveB1F_ScriptPointers
+	ld a, [wCeruleanCaveB1FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wUnknownDungeon3CurScript], a
+	ld [wCeruleanCaveB1FCurScript], a
 	ret
 
-.ScriptPointers:
+CeruleanCaveB1F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-UnknownDungeon3TextPointers:
+CeruleanCaveB1F_TextPointers:
 	dw MewtwoText
 	dw PickUpItemText
 	dw PickUpItemText
 	dw PickUpItemText
 	dw PickUpItemText
 
-UnknownDungeon3TrainerHeaders:
 MewtwoTrainerHeader:
 	dbEventFlagBit EVENT_BEAT_MEWTWO
 	db ($0 << 4) ; trainer's view range
diff --git a/scripts/ceruleancity.asm b/scripts/CeruleanCity.asm
index 4243d35c..c36b3dd6 100755
--- a/scripts/ceruleancity.asm
+++ b/scripts/CeruleanCity.asm
@@ -1,8 +1,8 @@
-CeruleanCityScript:
+CeruleanCity_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, CeruleanCityScriptPointers
+	ld hl, CeruleanCity_ScriptPointers
 	ld a, [wCeruleanCityCurScript]
-	jp JumpTable
+	jp CallFunctionInTable
 
 CeruleanCityScript_1948c:
 	xor a
@@ -12,7 +12,7 @@ CeruleanCityScript_1948c:
 	ld [wMissableObjectIndex], a
 	predef_jump HideObject
 
-CeruleanCityScriptPointers:
+CeruleanCity_ScriptPointers:
 	dw CeruleanCityScript0
 	dw CeruleanCityScript1
 	dw CeruleanCityScript2
@@ -111,10 +111,10 @@ CeruleanCityMovement1:
 	db $FF
 
 CeruleanCityScript_1955d:
-	ld a,1
-	ld [H_SPRITEINDEX],a
+	ld a, 1
+	ld [H_SPRITEINDEX], a
 	xor a ; SPRITE_FACING_DOWN
-	ld [hSpriteFacingDirection],a
+	ld [hSpriteFacingDirection], a
 	jp SetSpriteFacingDirectionAndDelay ; face object
 
 CeruleanCityScript1:
@@ -208,7 +208,7 @@ CeruleanCityScript3:
 	ld [wCeruleanCityCurScript], a
 	ret
 
-CeruleanCityTextPointers:
+CeruleanCity_TextPointers:
 	dw CeruleanCityText1
 	dw CeruleanCityText2
 	dw CeruleanCityText3
@@ -301,9 +301,10 @@ CeruleanCityText_196d9:
 
 ReceivedTM28Text:
 	TX_FAR _ReceivedTM28Text
-	db $0B
+	TX_SFX_ITEM_1
 	TX_FAR _ReceivedTM28Text2
-	db $0D, "@"
+	TX_WAIT
+	db "@"
 
 TM28NoRoomText:
 	TX_FAR _TM28NoRoomText
@@ -337,13 +338,13 @@ CeruleanCityText6:
 CeruleanCityText7:
 	TX_ASM
 	ld a, [hRandomAdd]
-	cp $b4
+	cp 180
 	jr c, .asm_e9fc9
 	ld hl, CeruleanCityText_19730
 	call PrintText
 	jr .asm_d486e
 .asm_e9fc9
-	cp $64
+	cp 100
 	jr c, .asm_df99b
 	ld hl, CeruleanCityText_19735
 	call PrintText
@@ -369,19 +370,19 @@ CeruleanCityText_1973a:
 CeruleanCityText8:
 	TX_ASM
 	ld a, [hRandomAdd]
-	cp $b4
+	cp 180
 	jr c, .asm_e28da
 	ld hl, CeruleanCityText_1976f
 	call PrintText
 	jr .asm_f2f38
 .asm_e28da
-	cp $78
+	cp 120
 	jr c, .asm_15d08
 	ld hl, CeruleanCityText_19774
 	call PrintText
 	jr .asm_f2f38
 .asm_15d08
-	cp $3c
+	cp 60
 	jr c, .asm_d7fea
 	ld hl, CeruleanCityText_19779
 	call PrintText
diff --git a/scripts/ceruleancity2.asm b/scripts/CeruleanCity_2.asm
index 53ace5c8..53ace5c8 100755
--- a/scripts/ceruleancity2.asm
+++ b/scripts/CeruleanCity_2.asm
diff --git a/scripts/ceruleangym.asm b/scripts/CeruleanGym.asm
index 78ed1fed..d1dd66e4 100755
--- a/scripts/ceruleangym.asm
+++ b/scripts/CeruleanGym.asm
@@ -1,11 +1,11 @@
-CeruleanGymScript:
+CeruleanGym_Script:
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
 	call nz, CeruleanGymScript_5c6d0
 	call EnableAutoTextBoxDrawing
-	ld hl, CeruleanGymTrainerHeaders
-	ld de, CeruleanGymScriptPointers
+	ld hl, CeruleanGymTrainerHeader0
+	ld de, CeruleanGym_ScriptPointers
 	ld a, [wCeruleanGymCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wCeruleanGymCurScript], a
@@ -29,7 +29,7 @@ CeruleanGymScript_5c6ed:
 	ld [wCurMapScript], a
 	ret
 
-CeruleanGymScriptPointers:
+CeruleanGym_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -55,7 +55,6 @@ CeruleanGymScript_5c70d:
 	call DisplayTextID
 	SetEvent EVENT_GOT_TM11
 	jr .gymVictory
-
 .BagFull
 	ld a, $7
 	ld [hSpriteIndexOrTextID], a
@@ -71,7 +70,7 @@ CeruleanGymScript_5c70d:
 
 	jp CeruleanGymScript_5c6ed
 
-CeruleanGymTextPointers:
+CeruleanGym_TextPointers:
 	dw CeruleanGymText1
 	dw CeruleanGymText2
 	dw CeruleanGymText3
@@ -80,7 +79,6 @@ CeruleanGymTextPointers:
 	dw CeruleanGymText6
 	dw CeruleanGymText7
 
-CeruleanGymTrainerHeaders:
 CeruleanGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_CERULEAN_GYM_TRAINER_0
 	db ($3 << 4) ; trainer's view range
@@ -149,9 +147,9 @@ CeruleanGymText5:
 	db "@"
 
 CeruleanGymText6:
-ReceivedTM11Text:
 	TX_FAR _ReceivedTM11Text
-	db $0B, "@"
+	TX_SFX_ITEM_1
+	db "@"
 
 CeruleanGymText7:
 	TX_FAR _CeruleanGymText_5c7d3
diff --git a/scripts/ceruleanmart.asm b/scripts/CeruleanMart.asm
index 76d83f90..f812aadd 100755
--- a/scripts/ceruleanmart.asm
+++ b/scripts/CeruleanMart.asm
@@ -1,7 +1,7 @@
-CeruleanMartScript:
+CeruleanMart_Script:
 	jp EnableAutoTextBoxDrawing
 
-CeruleanMartTextPointers:
+CeruleanMart_TextPointers:
 	dw CeruleanCashierText
 	dw CeruleanMartText2
 	dw CeruleanMartText3
diff --git a/scripts/ceruleanpokecenter.asm b/scripts/CeruleanPokecenter.asm
index 876d2bbd..de4fd57d 100755
--- a/scripts/ceruleanpokecenter.asm
+++ b/scripts/CeruleanPokecenter.asm
@@ -1,8 +1,8 @@
-CeruleanPokecenterScript:
+CeruleanPokecenter_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-CeruleanPokecenterTextPointers:
+CeruleanPokecenter_TextPointers:
 	dw CeruleanHealNurseText
 	dw CeruleanPokecenterText2
 	dw CeruleanPokecenterText3
diff --git a/scripts/ceruleanhouse1.asm b/scripts/CeruleanTradeHouse.asm
index ba75c240..8b5d4495 100755
--- a/scripts/ceruleanhouse1.asm
+++ b/scripts/CeruleanTradeHouse.asm
@@ -1,8 +1,8 @@
-CeruleanHouse1Script:
+CeruleanTradeHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-CeruleanHouse1TextPointers:
+CeruleanTradeHouse_TextPointers:
 	dw CeruleanHouse1Text1
 	dw CeruleanHouse1Text2
 	dw CeruleanHouse1Text3
@@ -62,7 +62,7 @@ CeruleanHouse1Text1:
 
 CeruleanHouse1Text_1cfc8:
 	TX_FAR MelanieText1
-	TX_WAIT_BUTTON
+	TX_WAIT
 	db "@"
 
 CeruleanHouse1Text_1cfce:
@@ -71,17 +71,17 @@ CeruleanHouse1Text_1cfce:
 
 CeruleanHouse1Text_1cfd3:
 	TX_FAR MelanieText3
-	TX_WAIT_BUTTON
+	TX_WAIT
 	db "@"
 
 CeruleanHouse1Text_1cfd9:
 	TX_FAR MelanieText4
-	TX_WAIT_BUTTON
+	TX_WAIT
 	db "@"
 
 CeruleanHouse1Text_1cfdf:
 	TX_FAR MelanieText5
-	TX_WAIT_BUTTON
+	TX_WAIT
 	db "@"
 
 CeruleanHouse1Text2:
diff --git a/scripts/ceruleanhousetrashed.asm b/scripts/CeruleanTrashedHouse.asm
index da848b7c..f249ef01 100755
--- a/scripts/ceruleanhousetrashed.asm
+++ b/scripts/CeruleanTrashedHouse.asm
@@ -1,8 +1,8 @@
-CeruleanHouseTrashedScript:
+CeruleanTrashedHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-CeruleanHouseTrashedTextPointers:
+CeruleanTrashedHouse_TextPointers:
 	dw CeruleanHouseTrashedText1
 	dw CeruleanHouseTrashedText2
 	dw CeruleanHouseTrashedText3
diff --git a/scripts/gary.asm b/scripts/ChampionsRoom.asm
index ef1a7328..b8ce710b 100755
--- a/scripts/gary.asm
+++ b/scripts/ChampionsRoom.asm
@@ -1,17 +1,17 @@
-GaryScript:
+ChampionsRoom_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, GaryScriptPointers
-	ld a, [wGaryCurScript]
-	call JumpTable
+	ld hl, ChampionsRoom_ScriptPointers
+	ld a, [wChampionsRoomCurScript]
+	call CallFunctionInTable
 	ret
 
 ResetGaryScript:
 	xor a
 	ld [wJoyIgnore], a
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
-GaryScriptPointers:
+ChampionsRoom_ScriptPointers:
 	dw GaryScript0
 	dw GaryScript1
 	dw GaryScript2
@@ -37,7 +37,7 @@ GaryScript1:
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
 	ld a, $2
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
 GaryEntrance_RLEMovement:
@@ -76,7 +76,7 @@ GaryScript2:
 	xor a
 	ld [hJoyHeld], a
 	ld a, $3
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
 GaryScript3:
@@ -94,7 +94,7 @@ GaryScript3:
 	ld [H_SPRITEINDEX], a
 	call SetSpriteMovementBytesToFF
 	ld a, $4
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
 GaryScript4:
@@ -113,7 +113,7 @@ GaryScript4:
 	ld [wMissableObjectIndex], a
 	predef ShowObject
 	ld a, $5
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
 OakEntranceAfterVictoryMovement:
@@ -144,7 +144,7 @@ GaryScript5:
 	ld [hSpriteIndexOrTextID], a
 	call GaryScript_760c8
 	ld a, $6
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
 GaryScript6:
@@ -157,7 +157,7 @@ GaryScript6:
 	ld [hSpriteIndexOrTextID], a
 	call GaryScript_760c8
 	ld a, $7
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
 GaryScript7:
@@ -174,7 +174,7 @@ GaryScript7:
 	ld [H_SPRITEINDEX], a
 	call MoveSprite
 	ld a, $8
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
 OakExitGaryRoomMovement:
@@ -190,7 +190,7 @@ GaryScript8:
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	ld a, $9
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
 GaryScript9:
@@ -203,7 +203,7 @@ GaryScript9:
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
 	ld a, $a
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
 WalkToHallOfFame_RLEMovment:
@@ -218,7 +218,7 @@ GaryScript10:
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $0
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
 GaryScript_760c8:
@@ -229,7 +229,7 @@ GaryScript_760c8:
 	ld [wJoyIgnore], a
 	ret
 
-GaryTextPointers:
+ChampionsRoom_TextPointers:
 	dw GaryText1
 	dw GaryText2
 	dw GaryText3
diff --git a/scripts/cinnabargym.asm b/scripts/CinnabarGym.asm
index e2de3f6d..2dc07e58 100755
--- a/scripts/cinnabargym.asm
+++ b/scripts/CinnabarGym.asm
@@ -1,9 +1,9 @@
-CinnabarGymScript:
+CinnabarGym_Script:
 	call CinnabarGymScript_75759
 	call EnableAutoTextBoxDrawing
-	ld hl, CinnabarGymScriptPointers
+	ld hl, CinnabarGym_ScriptPointers
 	ld a, [wCinnabarGymCurScript]
-	jp JumpTable
+	jp CallFunctionInTable
 
 CinnabarGymScript_75759:
 	ld hl, wCurrentMapScriptFlags
@@ -43,7 +43,7 @@ CinnabarGymScript_74f48:
 CinnabarGymFlagAction:
 	predef_jump FlagActionPredef
 
-CinnabarGymScriptPointers:
+CinnabarGym_ScriptPointers:
 	dw CinnabarGymScript0
 	dw CinnabarGymScript1
 	dw CinnabarGymScript2
@@ -230,7 +230,7 @@ CinnabarGymScript3_75857:
 
 	jp CinnabarGymScript_75792
 
-CinnabarGymTextPointers:
+CinnabarGym_TextPointers:
 	dw CinnabarGymText1
 	dw CinnabarGymText2
 	dw CinnabarGymText3
@@ -293,8 +293,8 @@ BlaineBattleText:
 
 BlaineEndBattleText:
 	TX_FAR _BlaineEndBattleText
-	db $11
-	db $d
+	TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded
+	TX_WAIT
 	db "@"
 
 BlaineFireBlastText:
@@ -307,7 +307,7 @@ BlaineBadgeText:
 
 ReceivedTM38Text:
 	TX_FAR _ReceivedTM38Text
-	db $0B
+	TX_SFX_ITEM_1
 	TX_FAR _TM38ExplanationText
 	db "@"
 
diff --git a/scripts/cinnabargym3.asm b/scripts/CinnabarGym3.asm
index 9e8cad74..9e8cad74 100755
--- a/scripts/cinnabargym3.asm
+++ b/scripts/CinnabarGym3.asm
diff --git a/scripts/cinnabargym2.asm b/scripts/CinnabarGym_2.asm
index 00118fb5..00118fb5 100755
--- a/scripts/cinnabargym2.asm
+++ b/scripts/CinnabarGym_2.asm
diff --git a/scripts/cinnabarisland.asm b/scripts/CinnabarIsland.asm
index c608f53d..5716428c 100755
--- a/scripts/cinnabarisland.asm
+++ b/scripts/CinnabarIsland.asm
@@ -1,14 +1,14 @@
-CinnabarIslandScript:
+CinnabarIsland_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
 	ResetEvent EVENT_MANSION_SWITCH_ON
 	ResetEvent EVENT_LAB_STILL_REVIVING_FOSSIL
-	ld hl, CinnabarIslandScriptPointers
+	ld hl, CinnabarIsland_ScriptPointers
 	ld a, [wCinnabarIslandCurScript]
-	jp JumpTable
+	jp CallFunctionInTable
 
-CinnabarIslandScriptPointers:
+CinnabarIsland_ScriptPointers:
 	dw CinnabarIslandScript0
 	dw CinnabarIslandScript1
 
@@ -50,7 +50,7 @@ CinnabarIslandScript1:
 	ld [wCinnabarIslandCurScript], a
 	ret
 
-CinnabarIslandTextPointers:
+CinnabarIsland_TextPointers:
 	dw CinnabarIslandText1
 	dw CinnabarIslandText2
 	dw CinnabarIslandText3
diff --git a/scripts/lab1.asm b/scripts/CinnabarLab.asm
index 5b08f4f2..aab3324b 100755
--- a/scripts/lab1.asm
+++ b/scripts/CinnabarLab.asm
@@ -1,8 +1,8 @@
-Lab1Script:
+CinnabarLab_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-Lab1TextPointers:
+CinnabarLab_TextPointers:
 	dw Lab1Text1
 	dw Lab1Text2
 	dw Lab1Text3
diff --git a/scripts/lab4.asm b/scripts/CinnabarLabFossilRoom.asm
index 7d0db339..f5f03a19 100755
--- a/scripts/lab4.asm
+++ b/scripts/CinnabarLabFossilRoom.asm
@@ -1,7 +1,7 @@
-Lab4Script:
+CinnabarLabFossilRoom_Script:
 	jp EnableAutoTextBoxDrawing
 
-Lab4TextPointers:
+CinnabarLabFossilRoom_TextPointers:
 	dw Lab4Text1
 	dw Lab4Text2
 
diff --git a/scripts/lab3.asm b/scripts/CinnabarLabMetronomeRoom.asm
index dbd0913d..6eddceae 100755
--- a/scripts/lab3.asm
+++ b/scripts/CinnabarLabMetronomeRoom.asm
@@ -1,7 +1,7 @@
-Lab3Script:
+CinnabarLabMetronomeRoom_Script:
 	jp EnableAutoTextBoxDrawing
 
-Lab3TextPointers:
+CinnabarLabMetronomeRoom_TextPointers:
 	dw Lab3Text1
 	dw Lab3Text2
 	dw Lab3Text3
@@ -37,7 +37,8 @@ TM35PreReceiveText:
 
 ReceivedTM35Text:
 	TX_FAR _ReceivedTM35Text
-	db $0B, "@"
+	TX_SFX_ITEM_1
+	db "@"
 
 TM35ExplanationText:
 	TX_FAR _TM35ExplanationText
diff --git a/scripts/lab2.asm b/scripts/CinnabarLabTradeRoom.asm
index ed9ef1b4..6093ae14 100755
--- a/scripts/lab2.asm
+++ b/scripts/CinnabarLabTradeRoom.asm
@@ -1,7 +1,7 @@
-Lab2Script:
+CinnabarLabTradeRoom_Script:
 	jp EnableAutoTextBoxDrawing
 
-Lab2TextPointers:
+CinnabarLabTradeRoom_TextPointers:
 	dw Lab2Text1
 	dw Lab2Text2
 	dw Lab2Text3
diff --git a/scripts/cinnabarmart.asm b/scripts/CinnabarMart.asm
index 55b82cf0..898948c7 100755
--- a/scripts/cinnabarmart.asm
+++ b/scripts/CinnabarMart.asm
@@ -1,7 +1,7 @@
-CinnabarMartScript:
+CinnabarMart_Script:
 	jp EnableAutoTextBoxDrawing
 
-CinnabarMartTextPointers:
+CinnabarMart_TextPointers:
 	dw CinnabarCashierText
 	dw CinnabarMartText2
 	dw CinnabarMartText3
diff --git a/scripts/cinnabarpokecenter.asm b/scripts/CinnabarPokecenter.asm
index a43e5385..53301266 100755
--- a/scripts/cinnabarpokecenter.asm
+++ b/scripts/CinnabarPokecenter.asm
@@ -1,8 +1,8 @@
-CinnabarPokecenterScript:
+CinnabarPokecenter_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-CinnabarPokecenterTextPointers:
+CinnabarPokecenter_TextPointers:
 	dw CinnabarHealNurseText
 	dw CinnabarPokecenterText2
 	dw CinnabarPokecenterText3
diff --git a/scripts/colosseum.asm b/scripts/Colosseum.asm
index bdfa3c44..8cc6b056 100644
--- a/scripts/colosseum.asm
+++ b/scripts/Colosseum.asm
@@ -1,7 +1,7 @@
-ColosseumScript:
-	jp TradeCenterScript
+Colosseum_Script:
+	jp TradeCenter_Script
 
-ColosseumTextPointers:
+Colosseum_TextPointers:
 	dw ColosseumText1
 
 ColosseumText1:
diff --git a/scripts/copycatshouse1f.asm b/scripts/CopycatsHouse1F.asm
index 25cd0fc2..a86625fc 100755
--- a/scripts/copycatshouse1f.asm
+++ b/scripts/CopycatsHouse1F.asm
@@ -1,7 +1,7 @@
-CopycatsHouse1FScript:
+CopycatsHouse1F_Script:
 	jp EnableAutoTextBoxDrawing
 
-CopycatsHouse1FTextPointers:
+CopycatsHouse1F_TextPointers:
 	dw CopycatsHouse1FText1
 	dw CopycatsHouse1FText2
 	dw CopycatsHouse1FText3
diff --git a/scripts/copycatshouse2f.asm b/scripts/CopycatsHouse2F.asm
index ee8f2cc7..e0ec5425 100755
--- a/scripts/copycatshouse2f.asm
+++ b/scripts/CopycatsHouse2F.asm
@@ -1,7 +1,7 @@
-CopycatsHouse2FScript:
+CopycatsHouse2F_Script:
 	jp EnableAutoTextBoxDrawing
 
-CopycatsHouse2FTextPointers:
+CopycatsHouse2F_TextPointers:
 	dw CopycatsHouse2FText1
 	dw CopycatsHouse2FText2
 	dw CopycatsHouse2FText3
@@ -53,10 +53,11 @@ TM31PreReceiveText:
 
 ReceivedTM31Text:
 	TX_FAR _ReceivedTM31Text
-	db $0B
+	TX_SFX_ITEM_1
 TM31ExplanationText1:
 	TX_FAR _TM31ExplanationText1
-	db $d, "@"
+	TX_WAIT
+	db "@"
 
 TM31ExplanationText2:
 	TX_FAR _TM31ExplanationText2
@@ -64,7 +65,8 @@ TM31ExplanationText2:
 
 TM31NoRoomText:
 	TX_FAR _TM31NoRoomText
-	db $d, "@"
+	TX_WAIT
+	db "@"
 
 CopycatsHouse2FText2:
 	TX_FAR _CopycatsHouse2FText2
diff --git a/scripts/daycarem.asm b/scripts/Daycare.asm
index 187f8579..5b65307e 100755
--- a/scripts/daycarem.asm
+++ b/scripts/Daycare.asm
@@ -1,7 +1,7 @@
-DayCareMScript:
+Daycare_Script:
 	jp EnableAutoTextBoxDrawing
 
-DayCareMTextPointers:
+Daycare_TextPointers:
 	dw DayCareMText1
 
 DayCareMText1:
diff --git a/scripts/DiglettsCave.asm b/scripts/DiglettsCave.asm
new file mode 100755
index 00000000..1d7b23f9
--- /dev/null
+++ b/scripts/DiglettsCave.asm
@@ -0,0 +1,5 @@
+DiglettsCave_Script:
+	jp EnableAutoTextBoxDrawing
+
+DiglettsCave_TextPointers:
+	db "@"
diff --git a/scripts/diglettscaveroute11.asm b/scripts/DiglettsCaveRoute11.asm
index d97a8446..54c3112e 100755
--- a/scripts/diglettscaveroute11.asm
+++ b/scripts/DiglettsCaveRoute11.asm
@@ -1,10 +1,10 @@
-DiglettsCaveEntranceRoute11Script:
+DiglettsCaveRoute11_Script:
 	call EnableAutoTextBoxDrawing
 	ld a, ROUTE_11
 	ld [wLastMap], a
 	ret
 
-DiglettsCaveEntranceRoute11TextPointers:
+DiglettsCaveRoute11_TextPointers:
 	dw DiglettsCaveEntranceRoute11Text1
 
 DiglettsCaveEntranceRoute11Text1:
diff --git a/scripts/diglettscaveroute2.asm b/scripts/DiglettsCaveRoute2.asm
index 9f061daa..5fe7777c 100755
--- a/scripts/diglettscaveroute2.asm
+++ b/scripts/DiglettsCaveRoute2.asm
@@ -1,9 +1,9 @@
-DiglettsCaveRoute2Script:
+DiglettsCaveRoute2_Script:
 	ld a, ROUTE_2
 	ld [wLastMap], a
 	jp EnableAutoTextBoxDrawing
 
-DiglettsCaveRoute2TextPointers:
+DiglettsCaveRoute2_TextPointers:
 	dw DiglettsCaveRoute2Text1
 
 DiglettsCaveRoute2Text1:
diff --git a/scripts/fightingdojo.asm b/scripts/FightingDojo.asm
index 9d28046f..fc691dba 100755
--- a/scripts/fightingdojo.asm
+++ b/scripts/FightingDojo.asm
@@ -1,7 +1,7 @@
-FightingDojoScript:
+FightingDojo_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, FightingDojoTrainerHeaders
-	ld de, FightingDojoScriptPointers
+	ld hl, FightingDojoTrainerHeader0
+	ld de, FightingDojo_ScriptPointers
 	ld a, [wFightingDojoCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wFightingDojoCurScript], a
@@ -14,7 +14,7 @@ FightingDojoScript_5cd70:
 	ld [wCurMapScript], a
 	ret
 
-FightingDojoScriptPointers:
+FightingDojo_ScriptPointers:
 	dw FightingDojoScript1
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -80,7 +80,7 @@ FightingDojoScript3:
 	ld [wCurMapScript], a
 	ret
 
-FightingDojoTextPointers:
+FightingDojo_TextPointers:
 	dw FightingDojoText1
 	dw FightingDojoText2
 	dw FightingDojoText3
@@ -90,7 +90,6 @@ FightingDojoTextPointers:
 	dw FightingDojoText7
 	dw FightingDojoText8
 
-FightingDojoTrainerHeaders:
 FightingDojoTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_FIGHTING_DOJO_TRAINER_0
 	db ($4 << 4) ; trainer's view range
@@ -303,7 +302,7 @@ FightingDojoText7:
 	jr nz, .done
 	ld a, [wcf91]
 	ld b, a
-	ld c,30
+	ld c, 30
 	call GivePokemon
 	jr nc, .done
 	SetEvents EVENT_GOT_HITMONCHAN, EVENT_DEFEATED_FIGHTING_DOJO
diff --git a/scripts/fuchsiahouse1.asm b/scripts/FuchsiaBillsGrandpasHouse.asm
index 95e59503..ca5f2c16 100755
--- a/scripts/fuchsiahouse1.asm
+++ b/scripts/FuchsiaBillsGrandpasHouse.asm
@@ -1,8 +1,8 @@
-FuchsiaHouse1Script:
+FuchsiaBillsGrandpasHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-FuchsiaHouse1TextPointers:
+FuchsiaBillsGrandpasHouse_TextPointers:
 	dw FuchsiaHouse1Text1
 	dw FuchsiaHouse1Text2
 	dw FuchsiaHouse1Text3
diff --git a/scripts/fuchsiacity.asm b/scripts/FuchsiaCity.asm
index 74d7ee30..d3f0ce32 100755
--- a/scripts/fuchsiacity.asm
+++ b/scripts/FuchsiaCity.asm
@@ -1,7 +1,7 @@
-FuchsiaCityScript:
+FuchsiaCity_Script:
 	jp EnableAutoTextBoxDrawing
 
-FuchsiaCityTextPointers:
+FuchsiaCity_TextPointers:
 	dw FuchsiaCityText1
 	dw FuchsiaCityText2
 	dw FuchsiaCityText3
diff --git a/scripts/fuchsiahouse3.asm b/scripts/FuchsiaGoodRodHouse.asm
index fe1da024..93a20e80 100755
--- a/scripts/fuchsiahouse3.asm
+++ b/scripts/FuchsiaGoodRodHouse.asm
@@ -1,7 +1,7 @@
-FuchsiaHouse3Script:
+FuchsiaGoodRodHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-FuchsiaHouse3TextPointers:
+FuchsiaGoodRodHouse_TextPointers:
 	dw FuchsiaHouse3Text1
 
 FuchsiaHouse3Text1:
@@ -49,7 +49,7 @@ FuchsiaHouse3Text_561bd:
 
 FuchsiaHouse3Text_561c2:
 	TX_FAR _FuchsiaHouse3Text_561c2
-	db $0B
+	TX_SFX_ITEM_1
 	db "@"
 
 UnusedText_561c8:
diff --git a/scripts/fuchsiagym.asm b/scripts/FuchsiaGym.asm
index 364fca37..15f016af 100755
--- a/scripts/fuchsiagym.asm
+++ b/scripts/FuchsiaGym.asm
@@ -1,8 +1,8 @@
-FuchsiaGymScript:
+FuchsiaGym_Script:
 	call FuchsiaGymScript_75453
 	call EnableAutoTextBoxDrawing
-	ld hl, FuchsiaGymTrainerHeaders
-	ld de, FuchsiaGymScriptPointers
+	ld hl, FuchsiaGymTrainerHeader0
+	ld de, FuchsiaGym_ScriptPointers
 	ld a, [wFuchsiaGymCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wFuchsiaGymCurScript], a
@@ -30,7 +30,7 @@ FuchsiaGymScript_75477:
 	ld [wCurMapScript], a
 	ret
 
-FuchsiaGymScriptPointers:
+FuchsiaGym_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -66,11 +66,11 @@ FuchsiaGymScript3_75497:
 	set 4, [hl]
 
 	; deactivate gym trainers
-	SetEventRange EVENT_BEAT_FUCHSIA_GYM_TRAINER_0, EVENT_BEAT_FUCHSIA_GYM_TRAINER_6
+	SetEventRange EVENT_BEAT_FUCHSIA_GYM_TRAINER_0, EVENT_BEAT_FUCHSIA_GYM_TRAINER_5
 
 	jp FuchsiaGymScript_75477
 
-FuchsiaGymTextPointers:
+FuchsiaGym_TextPointers:
 	dw FuchsiaGymText1
 	dw FuchsiaGymText2
 	dw FuchsiaGymText3
@@ -83,7 +83,6 @@ FuchsiaGymTextPointers:
 	dw FuchsiaGymText10
 	dw FuchsiaGymText11
 
-FuchsiaGymTrainerHeaders:
 FuchsiaGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_0
 	db ($2 << 4) ; trainer's view range
@@ -93,46 +92,46 @@ FuchsiaGymTrainerHeader0:
 	dw FuchsiaGymEndBattleText1 ; TextEndBattle
 	dw FuchsiaGymEndBattleText1 ; TextEndBattle
 
-FuchsiaGymTrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_2
+FuchsiaGymTrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_1
 	dw FuchsiaGymBattleText2 ; TextBeforeBattle
 	dw FuchsiaGymAfterBattleText2 ; TextAfterBattle
 	dw FuchsiaGymEndBattleText2 ; TextEndBattle
 	dw FuchsiaGymEndBattleText2 ; TextEndBattle
 
-FuchsiaGymTrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_3
+FuchsiaGymTrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_2
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_2
 	dw FuchsiaGymBattleText3 ; TextBeforeBattle
 	dw FuchsiaGymAfterBattleText3 ; TextAfterBattle
 	dw FuchsiaGymEndBattleText3 ; TextEndBattle
 	dw FuchsiaGymEndBattleText3 ; TextEndBattle
 
-FuchsiaGymTrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_4
+FuchsiaGymTrainerHeader3:
+	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_3
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_3
 	dw FuchsiaGymBattleText4 ; TextBeforeBattle
 	dw FuchsiaGymAfterBattleText4 ; TextAfterBattle
 	dw FuchsiaGymEndBattleText4 ; TextEndBattle
 	dw FuchsiaGymEndBattleText4 ; TextEndBattle
 
-FuchsiaGymTrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_5
+FuchsiaGymTrainerHeader4:
+	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_4
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_4
 	dw FuchsiaGymBattleText5 ; TextBeforeBattle
 	dw FuchsiaGymAfterBattleText5 ; TextAfterBattle
 	dw FuchsiaGymEndBattleText5 ; TextEndBattle
 	dw FuchsiaGymEndBattleText5 ; TextEndBattle
 
-FuchsiaGymTrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_6
+FuchsiaGymTrainerHeader5:
+	dbEventFlagBit EVENT_BEAT_FUCHSIA_GYM_TRAINER_5
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_FUCHSIA_GYM_TRAINER_5
 	dw FuchsiaGymBattleText6 ; TextBeforeBattle
 	dw FuchsiaGymAfterBattleText6 ; TextAfterBattle
 	dw FuchsiaGymEndBattleText6 ; TextEndBattle
@@ -193,7 +192,7 @@ FuchsiaGymText9:
 
 FuchsiaGymText10:
 	TX_FAR _ReceivedTM06Text
-	db $11
+	TX_SFX_KEY_ITEM
 
 TM06ExplanationText:
 	TX_FAR _TM06ExplanationText
@@ -223,7 +222,7 @@ FuchsiaGymAfterBattleText1:
 
 FuchsiaGymText3:
 	TX_ASM
-	ld hl, FuchsiaGymTrainerHeader2
+	ld hl, FuchsiaGymTrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -241,7 +240,7 @@ FuchsiaGymAfterBattleText2:
 
 FuchsiaGymText4:
 	TX_ASM
-	ld hl, FuchsiaGymTrainerHeader3
+	ld hl, FuchsiaGymTrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -259,7 +258,7 @@ FuchsiaGymAfterBattleText3:
 
 FuchsiaGymText5:
 	TX_ASM
-	ld hl, FuchsiaGymTrainerHeader4
+	ld hl, FuchsiaGymTrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -277,7 +276,7 @@ FuchsiaGymAfterBattleText4:
 
 FuchsiaGymText6:
 	TX_ASM
-	ld hl, FuchsiaGymTrainerHeader5
+	ld hl, FuchsiaGymTrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -295,7 +294,7 @@ FuchsiaGymAfterBattleText5:
 
 FuchsiaGymText7:
 	TX_ASM
-	ld hl, FuchsiaGymTrainerHeader6
+	ld hl, FuchsiaGymTrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
diff --git a/scripts/fuchsiamart.asm b/scripts/FuchsiaMart.asm
index 32dbe773..50786127 100755
--- a/scripts/fuchsiamart.asm
+++ b/scripts/FuchsiaMart.asm
@@ -1,8 +1,8 @@
-FuchsiaMartScript:
+FuchsiaMart_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-FuchsiaMartTextPointers:
+FuchsiaMart_TextPointers:
 	dw FuchsiaCashierText
 	dw FuchsiaMartText2
 	dw FuchsiaMartText3
diff --git a/scripts/fuchsiameetingroom.asm b/scripts/FuchsiaMeetingRoom.asm
index 7995a49b..95ac12fa 100755
--- a/scripts/fuchsiameetingroom.asm
+++ b/scripts/FuchsiaMeetingRoom.asm
@@ -1,8 +1,8 @@
-FuchsiaMeetingRoomScript:
+FuchsiaMeetingRoom_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-FuchsiaMeetingRoomTextPointers:
+FuchsiaMeetingRoom_TextPointers:
 	dw FuchsiaMeetingRoomText1
 	dw FuchsiaMeetingRoomText2
 	dw FuchsiaMeetingRoomText3
diff --git a/scripts/fuchsiapokecenter.asm b/scripts/FuchsiaPokecenter.asm
index 50f5ba76..40aa3d45 100755
--- a/scripts/fuchsiapokecenter.asm
+++ b/scripts/FuchsiaPokecenter.asm
@@ -1,8 +1,8 @@
-FuchsiaPokecenterScript:
+FuchsiaPokecenter_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-FuchsiaPokecenterTextPointers:
+FuchsiaPokecenter_TextPointers:
 	dw FuchsiaHealNurseText
 	dw FuchsiaPokecenterText2
 	dw FuchsiaPokecenterText3
diff --git a/scripts/celadongamecorner.asm b/scripts/GameCorner.asm
index 43aae927..e2b7690c 100755
--- a/scripts/celadongamecorner.asm
+++ b/scripts/GameCorner.asm
@@ -1,10 +1,10 @@
-CeladonGameCornerScript:
+GameCorner_Script:
 	call CeladonGameCornerScript_48bcf
 	call CeladonGameCornerScript_48bec
 	call EnableAutoTextBoxDrawing
-	ld hl, CeladonGameCornerScriptPointers
-	ld a, [wCeladonGameCornerCurScript]
-	jp JumpTable
+	ld hl, GameCorner_ScriptPointers
+	ld a, [wGameCornerCurScript]
+	jp CallFunctionInTable
 
 CeladonGameCornerScript_48bcf:
 	ld hl, wCurrentMapScriptFlags
@@ -38,11 +38,11 @@ CeladonGameCornerScript_48bec:
 CeladonGameCornerScript_48c07:
 	xor a
 	ld [wJoyIgnore], a
-	ld [wCeladonGameCornerCurScript], a
+	ld [wGameCornerCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-CeladonGameCornerScriptPointers:
+GameCorner_ScriptPointers:
 	dw CeladonGameCornerScript0
 	dw CeladonGameCornerScript1
 	dw CeladonGameCornerScript2
@@ -82,7 +82,7 @@ CeladonGameCornerScript1:
 	ld [H_SPRITEINDEX], a
 	call MoveSprite
 	ld a, $2
-	ld [wCeladonGameCornerCurScript], a
+	ld [wGameCornerCurScript], a
 	ret
 
 MovementData_48c5a:
@@ -117,10 +117,10 @@ CeladonGameCornerScript2:
 	set 5, [hl]
 	set 6, [hl]
 	ld a, $0
-	ld [wCeladonGameCornerCurScript], a
+	ld [wGameCornerCurScript], a
 	ret
 
-CeladonGameCornerTextPointers:
+GameCorner_TextPointers:
 	dw CeladonGameCornerText1
 	dw CeladonGameCornerText2
 	dw CeladonGameCornerText3
@@ -271,7 +271,7 @@ CeladonGameCornerText_48d9c:
 
 Received10CoinsText:
 	TX_FAR _Received10CoinsText
-	TX_SFX_ITEM
+	TX_SFX_ITEM_1
 	db "@"
 
 CeladonGameCornerText_48da7:
@@ -349,7 +349,8 @@ CeladonGameCornerText_48e26:
 
 Received20CoinsText:
 	TX_FAR _Received20CoinsText
-	db $0B, "@"
+	TX_SFX_ITEM_1
+	db "@"
 
 CeladonGameCornerText_48e31:
 	TX_FAR _CeladonGameCornerText_48e31
@@ -400,7 +401,8 @@ CeladonGameCornerText_48e88:
 
 CeladonGameCornerText_48e8d:
 	TX_FAR _CeladonGameCornerText_48e8d
-	db $0B, "@"
+	TX_SFX_ITEM_1
+	db "@"
 
 CeladonGameCornerText_48e93:
 	TX_FAR _CeladonGameCornerText_48e93
@@ -429,7 +431,7 @@ CeladonGameCornerText11:
 	ld [hJoyPressed], a
 	ld [hJoyReleased], a
 	ld a, $1
-	ld [wCeladonGameCornerCurScript], a
+	ld [wGameCornerCurScript], a
 	jp TextScriptEnd
 
 CeladonGameCornerText_48ece:
diff --git a/scripts/celadongamecorner2.asm b/scripts/GameCorner2.asm
index f8d25905..f8d25905 100755
--- a/scripts/celadongamecorner2.asm
+++ b/scripts/GameCorner2.asm
diff --git a/scripts/celadonprizeroom.asm b/scripts/GameCornerPrizeRoom.asm
index a07ce162..e6cf6f0d 100755
--- a/scripts/celadonprizeroom.asm
+++ b/scripts/GameCornerPrizeRoom.asm
@@ -1,7 +1,7 @@
-CeladonPrizeRoomScript:
+GameCornerPrizeRoom_Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonPrizeRoomTextPointers:
+GameCornerPrizeRoom_TextPointers:
 	dw CeladonPrizeRoomText1
 	dw CeladonPrizeRoomText2
 	dw CeladonPrizeRoomText3
diff --git a/scripts/halloffameroom.asm b/scripts/HallOfFame.asm
index 1bba347b..af424089 100755
--- a/scripts/halloffameroom.asm
+++ b/scripts/HallOfFame.asm
@@ -1,16 +1,16 @@
-HallofFameRoomScript:
+HallOfFame_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, HallofFameRoomScriptPointers
-	ld a, [wHallOfFameRoomCurScript]
-	jp JumpTable
+	ld hl, HallOfFame_ScriptPointers
+	ld a, [wHallOfFameCurScript]
+	jp CallFunctionInTable
 
 HallofFameRoomScript_5a4aa:
 	xor a
 	ld [wJoyIgnore], a
-	ld [wHallOfFameRoomCurScript], a
+	ld [wHallOfFameCurScript], a
 	ret
 
-HallofFameRoomScriptPointers:
+HallOfFame_ScriptPointers:
 	dw HallofFameRoomScript0
 	dw HallofFameRoomScript1
 	dw HallofFameRoomScript2
@@ -33,16 +33,16 @@ HallofFameRoomScript2:
 	inc hl
 	set 0, [hl]
 	xor a
-	ld hl, wLoreleiCurScript
-	ld [hli], a
-	ld [hli], a
-	ld [hl], a
-	ld [wLanceCurScript], a
-	ld [wHallOfFameRoomCurScript], a
+	ld hl, wLoreleisRoomCurScript
+	ld [hli], a ; wLoreleisRoomCurScript
+	ld [hli], a ; wBrunosRoomCurScript
+	ld [hl], a ; wAgathasRoomCurScript
+	ld [wLancesRoomCurScript], a
+	ld [wHallOfFameCurScript], a
 	; Elite 4 events
 	ResetEventRange ELITE4_EVENTS_START, ELITE4_CHAMPION_EVENTS_END, 1
 	xor a
-	ld [wHallOfFameRoomCurScript], a
+	ld [wHallOfFameCurScript], a
 	ld a, PALLET_TOWN
 	ld [wLastBlackoutMap], a
 	callba SaveSAVtoSRAM
@@ -65,7 +65,7 @@ HallofFameRoomScript0:
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
 	ld a, $1
-	ld [wHallOfFameRoomCurScript], a
+	ld [wHallOfFameCurScript], a
 	ret
 
 RLEMovement5a528:
@@ -94,14 +94,14 @@ HallofFameRoomScript1:
 	call DisplayTextID
 	ld a, $ff
 	ld [wJoyIgnore], a
-	ld a, HS_UNKNOWN_DUNGEON_GUY
+	ld a, HS_CERULEAN_CAVE_GUY
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	ld a, $2
-	ld [wHallOfFameRoomCurScript], a
+	ld [wHallOfFameCurScript], a
 	ret
 
-HallofFameRoomTextPointers:
+HallOfFame_TextPointers:
 	dw HallofFameRoomText1
 
 HallofFameRoomText1:
diff --git a/scripts/IndigoPlateau.asm b/scripts/IndigoPlateau.asm
new file mode 100755
index 00000000..86f38b2a
--- /dev/null
+++ b/scripts/IndigoPlateau.asm
@@ -0,0 +1,4 @@
+IndigoPlateau_Script:
+	ret
+
+IndigoPlateau_TextPointers:
diff --git a/scripts/indigoplateaulobby.asm b/scripts/IndigoPlateauLobby.asm
index 36ed7fd5..d618d155 100755
--- a/scripts/indigoplateaulobby.asm
+++ b/scripts/IndigoPlateauLobby.asm
@@ -1,4 +1,4 @@
-IndigoPlateauLobbyScript:
+IndigoPlateauLobby_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	call EnableAutoTextBoxDrawing
 	ld hl, wCurrentMapScriptFlags
@@ -14,7 +14,7 @@ IndigoPlateauLobbyScript:
 	ResetEventRange ELITE4_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR
 	ret
 
-IndigoPlateauLobbyTextPointers:
+IndigoPlateauLobby_TextPointers:
 	dw IndigoHealNurseText
 	dw IndigoPlateauLobbyText2
 	dw IndigoPlateauLobbyText3
diff --git a/scripts/lance.asm b/scripts/LancesRoom.asm
index 7d67f6cd..aec555a3 100755
--- a/scripts/lance.asm
+++ b/scripts/LancesRoom.asm
@@ -1,11 +1,11 @@
-LanceScript:
+LancesRoom_Script:
 	call LanceShowOrHideEntranceBlocks
 	call EnableAutoTextBoxDrawing
-	ld hl, LanceTrainerHeaders
-	ld de, LanceScriptPointers
-	ld a, [wLanceCurScript]
+	ld hl, LanceTrainerHeader0
+	ld de, LancesRoom_ScriptPointers
+	ld a, [wLancesRoomCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wLanceCurScript], a
+	ld [wLancesRoomCurScript], a
 	ret
 
 LanceShowOrHideEntranceBlocks:
@@ -38,10 +38,10 @@ LanceShowOrHideEntranceBlocks:
 
 ResetLanceScript:
 	xor a
-	ld [wLanceCurScript], a
+	ld [wLancesRoomCurScript], a
 	ret
 
-LanceScriptPointers:
+LancesRoom_ScriptPointers:
 	dw LanceScript0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw LanceScript2
@@ -104,7 +104,7 @@ WalkToLance:
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
 	ld a, $3
-	ld [wLanceCurScript], a
+	ld [wLancesRoomCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -122,14 +122,13 @@ LanceScript3:
 	call Delay3
 	xor a
 	ld [wJoyIgnore], a
-	ld [wLanceCurScript], a
+	ld [wLancesRoomCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-LanceTextPointers:
+LancesRoom_TextPointers:
 	dw LanceText1
 
-LanceTrainerHeaders:
 LanceTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_LANCES_ROOM_TRAINER_0
 	db ($0 << 4) ; trainer's view range
diff --git a/scripts/lavenderhouse2.asm b/scripts/LavenderCuboneHouse.asm
index b531c047..ff5aa732 100755
--- a/scripts/lavenderhouse2.asm
+++ b/scripts/LavenderCuboneHouse.asm
@@ -1,8 +1,8 @@
-LavenderHouse2Script:
+LavenderCuboneHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-LavenderHouse2TextPointers:
+LavenderCuboneHouse_TextPointers:
 	dw LavenderHouse2Text1
 	dw LavenderHouse2Text2
 
diff --git a/scripts/lavendermart.asm b/scripts/LavenderMart.asm
index 51b64992..47330e5d 100755
--- a/scripts/lavendermart.asm
+++ b/scripts/LavenderMart.asm
@@ -1,7 +1,7 @@
-LavenderMartScript:
+LavenderMart_Script:
 	jp EnableAutoTextBoxDrawing
 
-LavenderMartTextPointers:
+LavenderMart_TextPointers:
 	dw LavenderCashierText
 	dw LavenderMartText2
 	dw LavenderMartText3
diff --git a/scripts/lavenderpokecenter.asm b/scripts/LavenderPokecenter.asm
index 67960c1b..21270313 100755
--- a/scripts/lavenderpokecenter.asm
+++ b/scripts/LavenderPokecenter.asm
@@ -1,8 +1,8 @@
-LavenderPokecenterScript:
+LavenderPokecenter_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-LavenderPokecenterTextPointers:
+LavenderPokecenter_TextPointers:
 	dw LavenderHealNurseText
 	dw LavenderPokecenterText2
 	dw LavenderPokecenterText3
diff --git a/scripts/lavendertown.asm b/scripts/LavenderTown.asm
index daf490b1..c23996e9 100755
--- a/scripts/lavendertown.asm
+++ b/scripts/LavenderTown.asm
@@ -1,7 +1,7 @@
-LavenderTownScript:
+LavenderTown_Script:
 	jp EnableAutoTextBoxDrawing
 
-LavenderTownTextPointers:
+LavenderTown_TextPointers:
 	dw LavenderTownText1
 	dw LavenderTownText2
 	dw LavenderTownText3
diff --git a/scripts/lorelei.asm b/scripts/LoreleisRoom.asm
index 60be524d..81142377 100755
--- a/scripts/lorelei.asm
+++ b/scripts/LoreleisRoom.asm
@@ -1,11 +1,11 @@
-LoreleiScript:
+LoreleisRoom_Script:
 	call LoreleiShowOrHideExitBlock
 	call EnableAutoTextBoxDrawing
-	ld hl, LoreleiTrainerHeaders
-	ld de, LoreleiScriptPointers
-	ld a, [wLoreleiCurScript]
+	ld hl, LoreleiTrainerHeader0
+	ld de, LoreleisRoom_ScriptPointers
+	ld a, [wLoreleisRoomCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wLoreleiCurScript], a
+	ld [wLoreleisRoomCurScript], a
 	ret
 
 LoreleiShowOrHideExitBlock:
@@ -29,10 +29,10 @@ LoreleiShowOrHideExitBlock:
 
 ResetLoreleiScript:
 	xor a
-	ld [wLoreleiCurScript], a
+	ld [wLoreleisRoomCurScript], a
 	ret
 
-LoreleiScriptPointers:
+LoreleisRoom_ScriptPointers:
 	dw LoreleiScript0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw LoreleiScript2
@@ -56,7 +56,7 @@ LoreleiScriptWalkIntoRoom:
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
 	ld a, $3
-	ld [wLoreleiCurScript], a
+	ld [wLoreleisRoomCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -84,7 +84,7 @@ LoreleiScript0:
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
 	ld a, $3
-	ld [wLoreleiCurScript], a
+	ld [wLoreleisRoomCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -102,7 +102,7 @@ LoreleiScript3:
 	call Delay3
 	xor a
 	ld [wJoyIgnore], a
-	ld [wLoreleiCurScript], a
+	ld [wLoreleisRoomCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -115,11 +115,10 @@ LoreleiScript2:
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-LoreleiTextPointers:
+LoreleisRoom_TextPointers:
 	dw LoreleiText1
 	dw LoreleiDontRunAwayText
 
-LoreleiTrainerHeaders:
 LoreleiTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_LORELEIS_ROOM_TRAINER_0
 	db ($0 << 4) ; trainer's view range
diff --git a/scripts/lavenderhouse1.asm b/scripts/MrFujisHouse.asm
index 65637018..98190cd8 100755
--- a/scripts/lavenderhouse1.asm
+++ b/scripts/MrFujisHouse.asm
@@ -1,8 +1,8 @@
-LavenderHouse1Script:
+MrFujisHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-LavenderHouse1TextPointers:
+MrFujisHouse_TextPointers:
 	dw LavenderHouse1Text1
 	dw LavenderHouse1Text2
 	dw LavenderHouse1Text3
@@ -95,7 +95,7 @@ LavenderHouse1Text_1d94c:
 
 ReceivedFluteText:
 	TX_FAR _ReceivedFluteText
-	db $11
+	TX_SFX_KEY_ITEM
 	TX_FAR _FluteExplanationText
 	db "@"
 
diff --git a/scripts/saffronhouse2.asm b/scripts/MrPsychicsHouse.asm
index b4f6e31c..7d4f54c0 100755
--- a/scripts/saffronhouse2.asm
+++ b/scripts/MrPsychicsHouse.asm
@@ -1,7 +1,7 @@
-SaffronHouse2Script:
+MrPsychicsHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-SaffronHouse2TextPointers:
+MrPsychicsHouse_TextPointers:
 	dw SaffronHouse2Text1
 
 SaffronHouse2Text1:
@@ -33,7 +33,8 @@ TM29PreReceiveText:
 
 ReceivedTM29Text:
 	TX_FAR _ReceivedTM29Text
-	db $0B, "@"
+	TX_SFX_ITEM_1
+	db "@"
 
 TM29ExplanationText:
 	TX_FAR _TM29ExplanationText
diff --git a/scripts/mtmoon1.asm b/scripts/MtMoon1F.asm
index 604e490a..cb120420 100755
--- a/scripts/mtmoon1.asm
+++ b/scripts/MtMoon1F.asm
@@ -1,18 +1,18 @@
-MtMoon1Script:
+MtMoon1F_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, MtMoon1TrainerHeader0
-	ld de, MtMoon1ScriptPointers
-	ld a, [wMtMoon1CurScript]
+	ld de, MtMoon1F_ScriptPointers
+	ld a, [wMtMoon1FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wMtMoon1CurScript], a
+	ld [wMtMoon1FCurScript], a
 	ret
 
-MtMoon1ScriptPointers:
+MtMoon1F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-MtMoon1TextPointers:
+MtMoon1F_TextPointers:
 	dw MtMoon1Text1
 	dw MtMoon1Text2
 	dw MtMoon1Text3
@@ -28,7 +28,6 @@ MtMoon1TextPointers:
 	dw PickUpItemText
 	dw MtMoon1Text14
 
-MtMoon1TrainerHeaders:
 MtMoon1TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_0
 	db ($2 << 4) ; trainer's view range
@@ -38,55 +37,55 @@ MtMoon1TrainerHeader0:
 	dw MtMoon1EndBattleText2 ; TextEndBattle
 	dw MtMoon1EndBattleText2 ; TextEndBattle
 
-MtMoon1TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_2
+MtMoon1TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_1
 	dw MtMoon1BattleText3 ; TextBeforeBattle
 	dw MtMoon1AfterBattleText3 ; TextAfterBattle
 	dw MtMoon1EndBattleText3 ; TextEndBattle
 	dw MtMoon1EndBattleText3 ; TextEndBattle
 
-MtMoon1TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_3
+MtMoon1TrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_2
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_2
 	dw MtMoon1BattleText4 ; TextBeforeBattle
 	dw MtMoon1AfterBattleText4 ; TextAfterBattle
 	dw MtMoon1EndBattleText4 ; TextEndBattle
 	dw MtMoon1EndBattleText4 ; TextEndBattle
 
-MtMoon1TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_4
+MtMoon1TrainerHeader3:
+	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_3
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_3
 	dw MtMoon1BattleText5 ; TextBeforeBattle
 	dw MtMoon1AfterBattleText5 ; TextAfterBattle
 	dw MtMoon1EndBattleText5 ; TextEndBattle
 	dw MtMoon1EndBattleText5 ; TextEndBattle
 
-MtMoon1TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_5
+MtMoon1TrainerHeader4:
+	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_4
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_4
 	dw MtMoon1BattleText6 ; TextBeforeBattle
 	dw MtMoon1AfterBattleText6 ; TextAfterBattle
 	dw MtMoon1EndBattleText6 ; TextEndBattle
 	dw MtMoon1EndBattleText6 ; TextEndBattle
 
-MtMoon1TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_6
+MtMoon1TrainerHeader5:
+	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_5
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_5
 	dw MtMoon1BattleText7 ; TextBeforeBattle
 	dw MtMoon1AfterBattleText7 ; TextAfterBattle
 	dw MtMoon1EndBattleText7 ; TextEndBattle
 	dw MtMoon1EndBattleText7 ; TextEndBattle
 
-MtMoon1TrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_7
+MtMoon1TrainerHeader6:
+	dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_6
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_7
+	dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_6
 	dw MtMoon1BattleText8 ; TextBeforeBattle
 	dw MtMoon1AfterBattleText8 ; TextAfterBattle
 	dw MtMoon1EndBattleText8 ; TextEndBattle
@@ -101,32 +100,32 @@ MtMoon1Text1:
 
 MtMoon1Text2:
 	TX_ASM
-	ld hl, MtMoon1TrainerHeader2
+	ld hl, MtMoon1TrainerHeader1
 	jr MtMoon1TalkToTrainer
 
 MtMoon1Text3:
 	TX_ASM
-	ld hl, MtMoon1TrainerHeader3
+	ld hl, MtMoon1TrainerHeader2
 	jr MtMoon1TalkToTrainer
 
 MtMoon1Text4:
 	TX_ASM
-	ld hl, MtMoon1TrainerHeader4
+	ld hl, MtMoon1TrainerHeader3
 	jr MtMoon1TalkToTrainer
 
 MtMoon1Text5:
 	TX_ASM
-	ld hl, MtMoon1TrainerHeader5
+	ld hl, MtMoon1TrainerHeader4
 	jr MtMoon1TalkToTrainer
 
 MtMoon1Text6:
 	TX_ASM
-	ld hl, MtMoon1TrainerHeader6
+	ld hl, MtMoon1TrainerHeader5
 	jr MtMoon1TalkToTrainer
 
 MtMoon1Text7:
 	TX_ASM
-	ld hl, MtMoon1TrainerHeader7
+	ld hl, MtMoon1TrainerHeader6
 MtMoon1TalkToTrainer:
 	call TalkToTrainer
 	jp TextScriptEnd
diff --git a/scripts/mtmoon2.asm b/scripts/MtMoonB1F.asm
index 6d1e5339..779812c3 100755
--- a/scripts/mtmoon2.asm
+++ b/scripts/MtMoonB1F.asm
@@ -1,8 +1,8 @@
-MtMoon2Script:
+MtMoonB1F_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-MtMoon2TextPointers:
+MtMoonB1F_TextPointers:
 	dw MtMoonText1
 
 MtMoonText1:
diff --git a/scripts/mtmoon3.asm b/scripts/MtMoonB2F.asm
index aaa29825..cf4583d3 100755
--- a/scripts/mtmoon3.asm
+++ b/scripts/MtMoonB2F.asm
@@ -1,10 +1,10 @@
-MtMoon3Script:
+MtMoonB2F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, MtMoon3TrainerHeaders
-	ld de, MtMoon3ScriptPointers
-	ld a, [wMtMoon3CurScript]
+	ld hl, MtMoon3TrainerHeader0
+	ld de, MtMoonB2F_ScriptPointers
+	ld a, [wMtMoonB2FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wMtMoon3CurScript], a
+	ld [wMtMoonB2FCurScript], a
 	CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD
 	ret z
 	ld hl, CoordsData_49d37
@@ -43,18 +43,18 @@ MtMoon3Script_49cd7:
 	xor a
 	ld [wJoyIgnore], a
 MtMoon3Script_49ce5:
-	ld [wMtMoon3CurScript], a
+	ld [wMtMoonB2FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
 MtMoon3Script_49cec:
-	ld a, HS_MT_MOON_JESSIE
+	ld a, HS_MT_MOON_B2F_JESSIE
 	call MtMoon3Script_49f93
-	ld a, HS_MT_MOON_JAMES
+	ld a, HS_MT_MOON_B2F_JAMES
 	call MtMoon3Script_49f93
 	ret
 
-MtMoon3ScriptPointers:
+MtMoonB2F_ScriptPointers:
 	dw MtMoon3Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -204,10 +204,10 @@ MtMoon3Script5:
 	call DisplayTextID
 	CheckEvent EVENT_GOT_HELIX_FOSSIL
 	jr z, .asm_49e1d
-	ld a, HS_MT_MOON_3_FOSSIL_1
+	ld a, HS_MT_MOON_B2F_FOSSIL_1
 	jr .asm_49e1f
 .asm_49e1d
-	ld a, HS_MT_MOON_3_FOSSIL_2
+	ld a, HS_MT_MOON_B2F_FOSSIL_2
 .asm_49e1f
 	ld [wMissableObjectIndex], a
 	predef HideObject
@@ -232,9 +232,9 @@ MtMoon3Script_49e15:
 	ld [hJoyHeld], a
 	ld a, $FF ^ (A_BUTTON | B_BUTTON)
 	ld [wJoyIgnore], a
-	ld a, HS_MT_MOON_JESSIE
+	ld a, HS_MT_MOON_B2F_JESSIE
 	call MtMoon3Script_49f84
-	ld a, HS_MT_MOON_JAMES
+	ld a, HS_MT_MOON_B2F_JAMES
 	call MtMoon3Script_49f84
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
@@ -374,9 +374,9 @@ MtMoon3Script14:
 	ld a, $ff
 	ld [wJoyIgnore], a
 	call GBFadeOutToBlack
-	ld a, HS_MT_MOON_JESSIE
+	ld a, HS_MT_MOON_B2F_JESSIE
 	call MtMoon3Script_49f93
-	ld a, HS_MT_MOON_JAMES
+	ld a, HS_MT_MOON_B2F_JAMES
 	call MtMoon3Script_49f93
 	call UpdateSprites
 	call Delay3
@@ -408,7 +408,7 @@ MtMoon3Script_49f93:
 	predef HideObject
 	ret
 
-MtMoon3TextPointers:
+MtMoonB2F_TextPointers:
 	dw MtMoon3Text1
 	dw MtMoon3Text2
 	dw MtMoon3Text3
@@ -424,29 +424,28 @@ MtMoon3TextPointers:
 	dw MtMoon3Text13
 	dw MtMoon3Text14
 
-MtMoon3TrainerHeaders:
 MtMoon3TrainerHeader0:
-	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_2
+	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_1
 	db ($4 << 4)
-	dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_1
 	dw MtMoon3BattleText3
 	dw MtMoon3AfterBattleText3
 	dw MtMoon3EndBattleText3
 	dw MtMoon3EndBattleText3
 
 MtMoon3TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_3
+	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_2
 	db ($4 << 4)
-	dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_2
 	dw MtMoon3BattleText4
 	dw MtMoon3AfterBattleText4
 	dw MtMoon3EndBattleText4
 	dw MtMoon3EndBattleText4
 
 MtMoon3TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_4
+	dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_3
 	db ($4 << 4)
-	dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_3
 	dw MtMoon3BattleText5
 	dw MtMoon3AfterBattleText5
 	dw MtMoon3EndBattleText5
@@ -555,7 +554,7 @@ MtMoon3Text7:
 	call GiveItem
 	jp nc, MtMoon3Script_4a0fd
 	call MtMoon3Script_4a0f0
-	ld a, HS_MT_MOON_3_FOSSIL_1
+	ld a, HS_MT_MOON_B2F_FOSSIL_1
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	SetEvent EVENT_GOT_DOME_FOSSIL
@@ -582,7 +581,7 @@ MtMoon3Text8:
 	call GiveItem
 	jp nc, MtMoon3Script_4a0fd
 	call MtMoon3Script_4a0f0
-	ld a, HS_MT_MOON_3_FOSSIL_2
+	ld a, HS_MT_MOON_B2F_FOSSIL_2
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	SetEvent EVENT_GOT_HELIX_FOSSIL
@@ -602,7 +601,7 @@ MtMoon3Script_4a0f0:
 MtMoon3Text_4a0f6:
 	TX_FAR _MtMoon3Text_49f6f
 	TX_SFX_KEY_ITEM
-	TX_WAIT_BUTTON
+	TX_WAIT
 	db "@"
 
 MtMoon3Script_4a0fd:
@@ -612,7 +611,7 @@ MtMoon3Script_4a0fd:
 
 MtMoon3Text_4a106:
 	TX_FAR _MtMoon3Text_49f7f
-	TX_WAIT_BUTTON
+	TX_WAIT
 	db "@"
 
 MtMoon3Text_4a10c:
diff --git a/scripts/mtmoon3_2.asm b/scripts/MtMoonB2F_2.asm
index c6ec92b4..c6ec92b4 100755
--- a/scripts/mtmoon3_2.asm
+++ b/scripts/MtMoonB2F_2.asm
diff --git a/scripts/mtmoonpokecenter.asm b/scripts/MtMoonPokecenter.asm
index 76cc472a..77386109 100755
--- a/scripts/mtmoonpokecenter.asm
+++ b/scripts/MtMoonPokecenter.asm
@@ -1,8 +1,8 @@
-MtMoonPokecenterScript:
+MtMoonPokecenter_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-MtMoonPokecenterTextPointers:
+MtMoonPokecenter_TextPointers:
 	dw MtMoonHealNurseText
 	dw MtMoonPokecenterText2
 	dw MtMoonPokecenterText3
diff --git a/scripts/mtmoonpokecenter2.asm b/scripts/MtMoonPokecenter2.asm
index 6097342b..6097342b 100755
--- a/scripts/mtmoonpokecenter2.asm
+++ b/scripts/MtMoonPokecenter2.asm
diff --git a/scripts/museum1f.asm b/scripts/Museum1F.asm
index 30e6f594..fdae9293 100755
--- a/scripts/museum1f.asm
+++ b/scripts/Museum1F.asm
@@ -1,14 +1,14 @@
-Museum1FScript:
+Museum1F_Script:
 	ld a, $1
 	ld [wAutoTextBoxDrawingControl], a
 	xor a
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld hl, Museum1FScriptPointers
+	ld hl, Museum1F_ScriptPointers
 	ld a, [wMuseum1FCurScript]
-	call JumpTable
+	call CallFunctionInTable
 	ret
 
-Museum1FScriptPointers:
+Museum1F_ScriptPointers:
 	dw Museum1FScript0
 	dw Museum1FScript1
 
@@ -32,7 +32,7 @@ Museum1FScript0:
 Museum1FScript1:
 	ret
 
-Museum1FTextPointers:
+Museum1F_TextPointers:
 	dw Museum1FText1
 	dw Museum1FText2
 	dw Museum1FText3
diff --git a/scripts/museum1f2.asm b/scripts/Museum1F2.asm
index 7e8878a2..9b3df420 100755
--- a/scripts/museum1f2.asm
+++ b/scripts/Museum1F2.asm
@@ -181,7 +181,7 @@ Museum1FText_f1d6b:
 
 Museum1FText_f1d70:
 	TX_FAR _ReceivedOldAmberText
-	TX_SFX_ITEM
+	TX_SFX_ITEM_1
 	db "@"
 
 Museum1FText_f1d76:
diff --git a/scripts/museum2f.asm b/scripts/Museum2F.asm
index 93a8396e..e97b8ded 100755
--- a/scripts/museum2f.asm
+++ b/scripts/Museum2F.asm
@@ -1,8 +1,8 @@
-Museum2FScript:
+Museum2F_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-Museum2FTextPointers:
+Museum2F_TextPointers:
 	dw Museum2FText1
 	dw Museum2FText2
 	dw Museum2FText3
diff --git a/scripts/namerater.asm b/scripts/NameRatersHouse.asm
index 160948ac..323cb360 100755
--- a/scripts/namerater.asm
+++ b/scripts/NameRatersHouse.asm
@@ -1,4 +1,4 @@
-NameRaterScript:
+NameRatersHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
 NameRaterScript_1da15:
@@ -37,7 +37,7 @@ NameRaterScript_1da20:
 	scf
 	ret
 
-NameRaterTextPointers:
+NameRatersHouse_TextPointers:
 	dw NameRaterText1
 
 NameRaterText1:
diff --git a/scripts/oakslab.asm b/scripts/OaksLab.asm
index ad9572e7..04f31d2a 100755
--- a/scripts/oakslab.asm
+++ b/scripts/OaksLab.asm
@@ -1,16 +1,16 @@
-OaksLabScript:
+OaksLab_Script:
 	CheckEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS_2
 	call nz, OaksLabScript_1d076
 	ld a, $1
 	ld [wAutoTextBoxDrawingControl], a
 	xor a
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld hl, OaksLabScriptPointers
+	ld hl, OaksLab_ScriptPointers
 	ld a, [wOaksLabCurScript]
-	call JumpTable
+	call CallFunctionInTable
 	ret
 
-OaksLabScriptPointers:
+OaksLab_ScriptPointers:
 	dw OaksLabScript0
 	dw OaksLabScript1
 	dw OaksLabScript2
@@ -444,23 +444,21 @@ OaksLabScript16:
 	ld a, $11
 	ld [wOaksLabCurScript], a
 	ret
-
+; make the player keep facing the rival as he walks away
 .checkRivalPosition
 	ld a, [wNPCNumScriptedSteps]
-	cp 5
+	cp $5
 	jr nz, .turnPlayerDown
 	ld a, [wXCoord]
-	cp 4
+	cp $4
 	jr nz, .turnPlayerLeft
 	ld a, SPRITE_FACING_RIGHT
 	jr .done
-
 .turnPlayerLeft
 	ld a, SPRITE_FACING_LEFT
 	jr .done
-
 .turnPlayerDown
-	cp 4
+	cp $4
 	ret nz
 	xor a
 .done
@@ -698,14 +696,14 @@ OaksLabScript_1c8b9:
 	ret
 
 OaksLabScript_1d076:
-	ld hl, OaksLabTextPointers2
+	ld hl, OaksLab_TextPointers2
 	ld a, l
 	ld [wMapTextPtr], a
 	ld a, h
 	ld [wMapTextPtr + 1], a
 	ret
 
-OaksLabTextPointers:
+OaksLab_TextPointers:
 	dw OaksLabText1
 	dw OaksLabText2
 	dw OaksLabText3
@@ -734,7 +732,7 @@ OaksLabTextPointers:
 	dw OaksLabText26
 	dw OaksLabText27
 
-OaksLabTextPointers2:
+OaksLab_TextPointers2:
 	dw OaksLabText1
 	dw OaksLabText2
 	dw OaksLabText3
@@ -751,19 +749,17 @@ OaksLabText1:
 	jr nz, .beforeChooseMon
 	ld hl, OaksLabGaryText1
 	call PrintText
-	jr .asm_1c97a
-
+	jr .done
 .beforeChooseMon
 	CheckEventReuseA EVENT_GOT_STARTER
 	jr nz, .afterChooseMon
 	ld hl, OaksLabText40
 	call PrintText
-	jr .asm_1c97a
-
+	jr .done
 .afterChooseMon
 	ld hl, OaksLabText41
 	call PrintText
-.asm_1c97a
+.done
 	jp TextScriptEnd
 
 OaksLabGaryText1:
diff --git a/scripts/oakslab2.asm b/scripts/OaksLab2.asm
index 5e4e98a4..5e4e98a4 100755
--- a/scripts/oakslab2.asm
+++ b/scripts/OaksLab2.asm
diff --git a/scripts/pallettown.asm b/scripts/PalletTown.asm
index e98464ce..fbdee4bc 100755
--- a/scripts/pallettown.asm
+++ b/scripts/PalletTown.asm
@@ -1,14 +1,14 @@
-PalletTownScript:
+PalletTown_Script:
 	CheckEvent EVENT_GOT_POKEBALLS_FROM_OAK
 	jr z, .next
 	SetEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS
 .next
 	call EnableAutoTextBoxDrawing
-	ld hl, PalletTownScriptPointers
+	ld hl, PalletTown_ScriptPointers
 	ld a, [wPalletTownCurScript]
-	jp JumpTable
+	jp CallFunctionInTable
 
-PalletTownScriptPointers:
+PalletTown_ScriptPointers:
 	dw PalletTownScript0
 	dw PalletTownScript1
 	dw PalletTownScript2
@@ -220,7 +220,7 @@ PalletTownScript8:
 PalletTownScript9:
 	ret
 
-PalletTownTextPointers:
+PalletTown_TextPointers:
 	dw PalletTownText1
 	dw PalletTownText2
 	dw PalletTownText3
diff --git a/scripts/pewtercity.asm b/scripts/PewterCity.asm
index 0456bb86..63d0fe71 100755
--- a/scripts/pewtercity.asm
+++ b/scripts/PewterCity.asm
@@ -1,13 +1,13 @@
-PewterCityScript:
+PewterCity_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, wd492
 	res 7, [hl]
-	ld hl, PewterCityScriptPointers
+	ld hl, PewterCity_ScriptPointers
 	ld a, [wPewterCityCurScript]
-	call JumpTable
+	call CallFunctionInTable
 	ret
 
-PewterCityScriptPointers:
+PewterCity_ScriptPointers:
 	dw PewterCityScript0
 	dw PewterCityScript1
 	dw PewterCityScript2
@@ -176,7 +176,7 @@ PewterCityScript6:
 	ld [wPewterCityCurScript], a
 	ret
 
-PewterCityTextPointers:
+PewterCity_TextPointers:
 	dw PewterCityText1
 	dw PewterCityText2
 	dw PewterCityText3
@@ -298,9 +298,7 @@ PewterCityText_1945d:
 	db "@"
 
 PewterCityText14:
-
-PewterCityText_19462:
-	TX_FAR _PewterCityText_19462
+	TX_FAR _PewterCityText14
 	db "@"
 
 PewterCityText6:
diff --git a/scripts/pewtergym.asm b/scripts/PewterGym.asm
index f9fc4ed2..4ddec77e 100755
--- a/scripts/pewtergym.asm
+++ b/scripts/PewterGym.asm
@@ -1,11 +1,11 @@
-PewterGymScript:
+PewterGym_Script:
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
 	call nz, PewterGymScript_5c3a4
 	call EnableAutoTextBoxDrawing
-	ld hl, PewterGymTrainerHeaders
-	ld de, PewterGymScriptPointers
+	ld hl, PewterGymTrainerHeader0
+	ld de, PewterGym_ScriptPointers
 	ld a, [wPewterGymCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wPewterGymCurScript], a
@@ -30,7 +30,7 @@ PewterGymScript_5c3bf:
 	ld [wCurMapScript], a
 	ret
 
-PewterGymScriptPointers:
+PewterGym_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -55,7 +55,6 @@ PewterGymScript_5c3df:
 	call DisplayTextID
 	SetEvent EVENT_GOT_TM34
 	jr .gymVictory
-
 .BagFull
 	ld a, $6
 	ld [hSpriteIndexOrTextID], a
@@ -80,7 +79,7 @@ PewterGymScript_5c3df:
 
 	jp PewterGymScript_5c3bf
 
-PewterGymTextPointers:
+PewterGym_TextPointers:
 	dw PewterGymText1
 	dw PewterGymText2
 	dw PewterGymText3
@@ -88,7 +87,6 @@ PewterGymTextPointers:
 	dw PewterGymText5
 	dw PewterGymText6
 
-PewterGymTrainerHeaders:
 PewterGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_PEWTER_GYM_TRAINER_0
 	db ($5 << 4) ; trainer's view range
@@ -105,11 +103,11 @@ PewterGymText1:
 	CheckEvent EVENT_BEAT_BROCK
 	jr z, .beginBattle
 	CheckEventReuseA EVENT_GOT_TM34
-	jr nz, .afterVictory
+	jr nz, .gymVictory
 	call z, PewterGymScript_5c3df
 	call DisableWaitingAfterTextDisplay
 	jr .done
-.afterVictory
+.gymVictory
 	ld hl, PewterGymText_5c4a3
 	call PrintText
 	jr .done
@@ -150,7 +148,7 @@ PewterGymText4:
 
 PewterGymText5:
 	TX_FAR _ReceivedTM34Text
-	TX_SFX_ITEM
+	TX_SFX_ITEM_1
 	TX_FAR _TM34ExplanationText
 	db "@"
 
@@ -160,7 +158,7 @@ PewterGymText6:
 
 PewterGymText_5c4bc:
 	TX_FAR _PewterGymText_5c4bc
-	TX_SFX_ITEM
+	TX_SFX_ITEM_1
 	TX_FAR _PewterGymText_5c4c1
 	db "@"
 
diff --git a/scripts/pewtermart.asm b/scripts/PewterMart.asm
index 64915563..5b3e7617 100755
--- a/scripts/pewtermart.asm
+++ b/scripts/PewterMart.asm
@@ -1,10 +1,10 @@
-PewterMartScript:
+PewterMart_Script:
 	call EnableAutoTextBoxDrawing
 	ld a, $1
 	ld [wAutoTextBoxDrawingControl], a
 	ret
 
-PewterMartTextPointers:
+PewterMart_TextPointers:
 	dw PewterCashierText
 	dw PewterMartText2
 	dw PewterMartText3
diff --git a/scripts/pewterhouse1.asm b/scripts/PewterNidoranHouse.asm
index ba0f631f..2f3f4145 100755
--- a/scripts/pewterhouse1.asm
+++ b/scripts/PewterNidoranHouse.asm
@@ -1,8 +1,8 @@
-PewterHouse1Script:
+PewterNidoranHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-PewterHouse1TextPointers:
+PewterNidoranHouse_TextPointers:
 	dw PewterHouse1Text1
 	dw PewterHouse1Text2
 	dw PewterHouse1Text3
diff --git a/scripts/pewterpokecenter.asm b/scripts/PewterPokecenter.asm
index 78bfc9fa..add001bc 100755
--- a/scripts/pewterpokecenter.asm
+++ b/scripts/PewterPokecenter.asm
@@ -1,11 +1,11 @@
-PewterPokecenterScript:
+PewterPokecenter_Script:
 	ld hl, wd492
 	set 7, [hl]
 	call Serial_TryEstablishingExternallyClockedConnection
 	call EnableAutoTextBoxDrawing
 	ret
 
-PewterPokecenterTextPointers:
+PewterPokecenter_TextPointers:
 	dw PewterHealNurseText
 	dw PewterPokecenterText2
 	dw PewterJigglypuffText
diff --git a/scripts/pewterpokecenter2.asm b/scripts/PewterPokecenter2.asm
index 9f035fa9..3d4de3f7 100755
--- a/scripts/pewterpokecenter2.asm
+++ b/scripts/PewterPokecenter2.asm
@@ -15,40 +15,46 @@ PewterJigglypuff:
 	call StopAllMusic
 	ld c, 32
 	call DelayFrames
-	ld hl, JigglypuffSpinData
+	ld hl, JigglypuffFacingDirections
 	ld de, wJigglypuffFacingDirections
-	ld bc, JigglypuffSpinDataEnd - JigglypuffSpinData
+	ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections
 	call CopyData
-	ld a, [wSpriteStateData1 + 3 * $10 + 2]
+
+	ld a, [wSprite03StateData1ImageIndex]
 	ld hl, wJigglypuffFacingDirections
-.asm_f1dc9
+.findMatchingFacingDirectionLoop
 	cp [hl]
 	inc hl
-	jr nz, .asm_f1dc9
+	jr nz, .findMatchingFacingDirectionLoop
 	dec hl
 	push hl
 	ld c, BANK(Music_JigglypuffSong)
 	ld a, MUSIC_JIGGLYPUFF_SONG
 	call PlayMusic
 	pop hl
-.asm_f1dd7
+.loop
 	ld a, [hl]
-	ld [wSpriteStateData1 + 3 * $10 + 2], a
+	ld [wSprite03StateData1ImageIndex], a
+
+; rotate the array
 	push hl
 	ld hl, wJigglypuffFacingDirections
-	ld de, wJigglypuffFacingDirections2
-	ld bc, JigglypuffSpinDataEnd - JigglypuffSpinData
+	ld de, wJigglypuffFacingDirections - 1
+	ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections
 	call CopyData
-	ld a, [wJigglypuffFacingDirections2]
-	ld [wcd42], a
+	ld a, [wJigglypuffFacingDirections - 1]
+	ld [wJigglypuffFacingDirections + 3], a
 	pop hl
+
 	ld c, 24
 	call DelayFrames
+
 	ld a, [wChannelSoundIDs]
 	ld b, a
-	ld a, [wChannelSoundIDs + 1]
+	ld a, [wChannelSoundIDs + Ch2]
 	or b
-	jr nz, .asm_f1dd7
+	jr nz, .loop
+
 	ld c, 48
 	call DelayFrames
 	call PlayDefaultMusic
@@ -64,9 +70,9 @@ PewterJigglypuff:
 	TX_FAR _PewterJigglypuffText
 	db "@"
 
-JigglypuffSpinData:
+JigglypuffFacingDirections:
 	db $40 | SPRITE_FACING_DOWN
 	db $40 | SPRITE_FACING_LEFT
 	db $40 | SPRITE_FACING_UP
 	db $40 | SPRITE_FACING_RIGHT
-JigglypuffSpinDataEnd:
+JigglypuffFacingDirectionsEnd:
diff --git a/scripts/pewterhouse2.asm b/scripts/PewterSpeechHouse.asm
index e3bbe01e..943e1759 100755
--- a/scripts/pewterhouse2.asm
+++ b/scripts/PewterSpeechHouse.asm
@@ -1,7 +1,7 @@
-PewterHouse2Script:
+PewterSpeechHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-PewterHouse2TextPointers:
+PewterSpeechHouse_TextPointers:
 	dw PewterHouse2Text1
 	dw PewterHouse2Text2
 
diff --git a/scripts/fanclub.asm b/scripts/PokemonFanClub.asm
index 7bb1bc86..3434f871 100755
--- a/scripts/fanclub.asm
+++ b/scripts/PokemonFanClub.asm
@@ -1,11 +1,11 @@
-FanClubScript:
+PokemonFanClub_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, FanClubScriptPointers
+	ld hl, PokemonFanClub_ScriptPointers
 	ld a, [wFanClubCurScript]
-	call JumpTable
+	call CallFunctionInTable
 	ret
 
-FanClubScriptPointers:
+PokemonFanClub_ScriptPointers:
 	dw FanClubScript1
 	dw FanClubScript2
 
@@ -68,7 +68,7 @@ PikachuMovementScript_59a8c:
 	db $1e
 	db $3f
 
-FanClubTextPointers:
+PokemonFanClub_TextPointers:
 	dw FanClubText1
 	dw FanClubText2
 	dw FanClubText3
diff --git a/scripts/mansion1.asm b/scripts/PokemonMansion1F.asm
index d659d993..639a4acf 100755
--- a/scripts/mansion1.asm
+++ b/scripts/PokemonMansion1F.asm
@@ -1,11 +1,11 @@
-Mansion1Script:
+PokemonMansion1F_Script:
 	call Mansion1Subscript1
 	call EnableAutoTextBoxDrawing
-	ld hl, Mansion1TrainerHeaders
-	ld de, Mansion1ScriptPointers
-	ld a, [wMansion1CurScript]
+	ld hl, Mansion1TrainerHeader0
+	ld de, PokemonMansion1F_ScriptPointers
+	ld a, [wPokemonMansion1FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wMansion1CurScript], a
+	ld [wPokemonMansion1FCurScript], a
 	ret
 
 Mansion1Subscript1:
@@ -55,18 +55,17 @@ Mansion1Script_Switches:
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-Mansion1ScriptPointers:
+PokemonMansion1F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Mansion1TextPointers:
+PokemonMansion1F_TextPointers:
 	dw Mansion1Text1
 	dw PickUpItemText
 	dw PickUpItemText
 	dw Mansion1Text4
 
-Mansion1TrainerHeaders:
 Mansion1TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_MANSION_1_TRAINER_0
 	db ($3 << 4) ; trainer's view range
diff --git a/scripts/mansion2.asm b/scripts/PokemonMansion2F.asm
index 7edfd097..8d05cdc9 100755
--- a/scripts/mansion2.asm
+++ b/scripts/PokemonMansion2F.asm
@@ -1,11 +1,11 @@
-Mansion2Script:
+PokemonMansion2F_Script:
 	call Mansion2Script_51fee
 	call EnableAutoTextBoxDrawing
-	ld hl, Mansion2TrainerHeaders
-	ld de, Mansion2ScriptPointers
-	ld a, [wMansion2CurScript]
+	ld hl, Mansion2TrainerHeader0
+	ld de, PokemonMansion2F_ScriptPointers
+	ld a, [wPokemonMansion2FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wMansion2CurScript], a
+	ld [wPokemonMansion2FCurScript], a
 	ret
 
 Mansion2Script_51fee:
@@ -51,19 +51,18 @@ Mansion2Script_Switches:
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-Mansion2ScriptPointers:
+PokemonMansion2F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Mansion2TextPointers:
+PokemonMansion2F_TextPointers:
 	dw Mansion2Text1
 	dw PickUpItemText
 	dw Mansion2Text3
 	dw Mansion2Text4
 	dw Mansion2Text5
 
-Mansion2TrainerHeaders:
 Mansion2TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_MANSION_2_TRAINER_0
 	db ($0 << 4) ; trainer's view range
diff --git a/scripts/mansion3.asm b/scripts/PokemonMansion3F.asm
index 990ad434..e19fec72 100755
--- a/scripts/mansion3.asm
+++ b/scripts/PokemonMansion3F.asm
@@ -1,11 +1,11 @@
-Mansion3Script:
+PokemonMansion3F_Script:
 	call Mansion3Script_52204
 	call EnableAutoTextBoxDrawing
 	ld hl, Mansion3TrainerHeader0
-	ld de, Mansion3ScriptPointers
-	ld a, [wMansion3CurScript]
+	ld de, PokemonMansion3F_ScriptPointers
+	ld a, [wPokemonMansion3FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wMansion3CurScript], a
+	ld [wPokemonMansion3FCurScript], a
 	ret
 
 Mansion3Script_52204:
@@ -16,22 +16,22 @@ Mansion3Script_52204:
 	CheckEvent EVENT_MANSION_SWITCH_ON
 	jr nz, .asm_52224
 	ld a, $e
-	ld bc, $207
+	lb bc, 2, 7
 	call Mansion2Script_5202f
 	ld a, $5f
-	ld bc, $507
+	lb bc, 5, 7
 	call Mansion2Script_5202f
 	ret
 .asm_52224
 	ld a, $5f
-	ld bc, $207
+	lb bc, 2, 7
 	call Mansion2Script_5202f
 	ld a, $e
-	ld bc, $507
+	lb bc, 5, 7
 	call Mansion2Script_5202f
 	ret
 
-Mansion3ScriptPointers:
+PokemonMansion3F_ScriptPointers:
 	dw Mansion3Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -43,9 +43,9 @@ Mansion3Script0:
 	and a
 	jp z, CheckFightingMapTrainers
 	cp $3
-	ld a, $a5
+	ld a, POKEMON_MANSION_1F
 	jr nz, .asm_52250
-	ld a, $d6
+	ld a, POKEMON_MANSION_2F
 .asm_52250
 	ld [wDungeonWarpDestinationMap], a
 	ret
@@ -82,7 +82,7 @@ Mansion3Script_Switches:
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-Mansion3TextPointers:
+PokemonMansion3F_TextPointers:
 	dw Mansion3Text1
 	dw Mansion3Text2
 	dw PickUpItemText
@@ -90,7 +90,6 @@ Mansion3TextPointers:
 	dw Mansion3Text5
 	dw Mansion3Text6
 
-Mansion3TrainerHeaders:
 Mansion3TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_0
 	db ($0 << 4) ; trainer's view range
@@ -100,10 +99,10 @@ Mansion3TrainerHeader0:
 	dw Mansion3EndBattleText1 ; TextEndBattle
 	dw Mansion3EndBattleText1 ; TextEndBattle
 
-Mansion3TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_2
+Mansion3TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_MANSION_3_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_MANSION_3_TRAINER_1
 	dw Mansion3BattleText2 ; TextBeforeBattle
 	dw Mansion3AfterBattleText2 ; TextAfterBattle
 	dw Mansion3EndBattleText2 ; TextEndBattle
@@ -119,7 +118,7 @@ Mansion3Text1:
 
 Mansion3Text2:
 	TX_ASM
-	ld hl, Mansion3TrainerHeader2
+	ld hl, Mansion3TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
diff --git a/scripts/mansion4.asm b/scripts/PokemonMansionB1F.asm
index 57687fec..0a668c09 100755
--- a/scripts/mansion4.asm
+++ b/scripts/PokemonMansionB1F.asm
@@ -1,11 +1,11 @@
-Mansion4Script:
+PokemonMansionB1F_Script:
 	call Mansion4Script_523cf
 	call EnableAutoTextBoxDrawing
 	ld hl, Mansion4TrainerHeader0
-	ld de, Mansion4ScriptPointers
-	ld a, [wMansion4CurScript]
+	ld de, PokemonMansionB1F_ScriptPointers
+	ld a, [wPokemonMansionB1FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wMansion4CurScript], a
+	ld [wPokemonMansionB1FCurScript], a
 	ret
 
 Mansion4Script_523cf:
@@ -53,12 +53,12 @@ Mansion4Script_Switches:
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-Mansion4ScriptPointers:
+PokemonMansionB1F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Mansion4TextPointers:
+PokemonMansionB1F_TextPointers:
 	dw Mansion4Text1
 	dw Mansion4Text2
 	dw PickUpItemText
@@ -69,7 +69,6 @@ Mansion4TextPointers:
 	dw PickUpItemText
 	dw Mansion3Text6
 
-Mansion4TrainerHeaders:
 Mansion4TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_0
 	db ($0 << 4) ; trainer's view range
@@ -79,10 +78,10 @@ Mansion4TrainerHeader0:
 	dw Mansion4EndBattleText1 ; TextEndBattle
 	dw Mansion4EndBattleText1 ; TextEndBattle
 
-Mansion4TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_2
+Mansion4TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_MANSION_4_TRAINER_1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_MANSION_4_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_MANSION_4_TRAINER_1
 	dw Mansion4BattleText2 ; TextBeforeBattle
 	dw Mansion4AfterBattleText2 ; TextAfterBattle
 	dw Mansion4EndBattleText2 ; TextEndBattle
@@ -98,7 +97,7 @@ Mansion4Text1:
 
 Mansion4Text2:
 	TX_ASM
-	ld hl, Mansion4TrainerHeader2
+	ld hl, Mansion4TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
diff --git a/scripts/pokemontower1.asm b/scripts/PokemonTower1F.asm
index 1209b875..b383c647 100755
--- a/scripts/pokemontower1.asm
+++ b/scripts/PokemonTower1F.asm
@@ -1,8 +1,8 @@
-PokemonTower1Script:
+PokemonTower1F_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-PokemonTower1TextPointers:
+PokemonTower1F_TextPointers:
 	dw PokemonTower1Text1
 	dw PokemonTower1Text2
 	dw PokemonTower1Text3
diff --git a/scripts/pokemontower2.asm b/scripts/PokemonTower2F.asm
index 0a0aa3d5..54f49cae 100755
--- a/scripts/pokemontower2.asm
+++ b/scripts/PokemonTower2F.asm
@@ -1,17 +1,17 @@
-PokemonTower2Script:
+PokemonTower2F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, PokemonTower2ScriptPointers
-	ld a, [wPokemonTower2CurScript]
-	jp JumpTable
+	ld hl, PokemonTower2F_ScriptPointers
+	ld a, [wPokemonTower2FCurScript]
+	jp CallFunctionInTable
 
 PokemonTower2Script_604fe:
 	xor a
 	ld [wJoyIgnore], a
-	ld [wPokemonTower2CurScript], a
+	ld [wPokemonTower2FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-PokemonTower2ScriptPointers:
+PokemonTower2F_ScriptPointers:
 	dw PokemonTower2Script0
 	dw PokemonTower2Script1
 	dw PokemonTower2Script2
@@ -78,7 +78,7 @@ PokemonTower2Script1:
 	call StopAllMusic
 	callba Music_RivalAlternateStart
 	ld a, $2
-	ld [wPokemonTower2CurScript], a
+	ld [wPokemonTower2FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -108,18 +108,18 @@ PokemonTower2Script2:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
-	ld a, HS_POKEMONTOWER_2_RIVAL
+	ld a, HS_POKEMON_TOWER_2F_RIVAL
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	xor a
 	ld [wJoyIgnore], a
 	call PlayDefaultMusic
 	ld a, $0
-	ld [wPokemonTower2CurScript], a
+	ld [wPokemonTower2FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-PokemonTower2TextPointers:
+PokemonTower2F_TextPointers:
 	dw PokemonTower2Text1
 	dw PokemonTower2Text2
 
@@ -146,7 +146,7 @@ PokemonTower2Text1:
 	ld [wTrainerNo], a
 
 	ld a, $1
-	ld [wPokemonTower2CurScript], a
+	ld [wPokemonTower2FCurScript], a
 	ld [wCurMapScript], a
 .asm_41852
 	jp TextScriptEnd
diff --git a/scripts/pokemontower2_2.asm b/scripts/PokemonTower2F_2.asm
index 42659da3..42659da3 100755
--- a/scripts/pokemontower2_2.asm
+++ b/scripts/PokemonTower2F_2.asm
diff --git a/scripts/pokemontower3.asm b/scripts/PokemonTower3F.asm
index 8be15c9e..7d8f63e9 100755
--- a/scripts/pokemontower3.asm
+++ b/scripts/PokemonTower3F.asm
@@ -1,24 +1,23 @@
-PokemonTower3Script:
+PokemonTower3F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, PokemonTower3TrainerHeaders
-	ld de, PokemonTower3ScriptPointers
-	ld a, [wPokemonTower3CurScript]
+	ld hl, PokemonTower3TrainerHeader0
+	ld de, PokemonTower3F_ScriptPointers
+	ld a, [wPokemonTower3FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wPokemonTower3CurScript], a
+	ld [wPokemonTower3FCurScript], a
 	ret
 
-PokemonTower3ScriptPointers:
+PokemonTower3F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-PokemonTower3TextPointers:
+PokemonTower3F_TextPointers:
 	dw PokemonTower3Text1
 	dw PokemonTower3Text2
 	dw PokemonTower3Text3
 	dw PickUpItemText
 
-PokemonTower3TrainerHeaders:
 PokemonTower3TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_3_TRAINER_0
 	db ($2 << 4) ; trainer's view range
diff --git a/scripts/pokemontower4.asm b/scripts/PokemonTower4F.asm
index fe7a4e08..b8e0d772 100755
--- a/scripts/pokemontower4.asm
+++ b/scripts/PokemonTower4F.asm
@@ -1,18 +1,18 @@
-PokemonTower4Script:
+PokemonTower4F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, PokemonTower4TrainerHeaders
-	ld de, PokemonTower4ScriptPointers
-	ld a, [wPokemonTower4CurScript]
+	ld hl, PokemonTower4TrainerHeader0
+	ld de, PokemonTower4F_ScriptPointers
+	ld a, [wPokemonTower4FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wPokemonTower4CurScript], a
+	ld [wPokemonTower4FCurScript], a
 	ret
 
-PokemonTower4ScriptPointers:
+PokemonTower4F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-PokemonTower4TextPointers:
+PokemonTower4F_TextPointers:
 	dw PokemonTower4Text1
 	dw PokemonTower4Text2
 	dw PokemonTower4Text3
@@ -20,7 +20,6 @@ PokemonTower4TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
-PokemonTower4TrainerHeaders:
 PokemonTower4TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_4_TRAINER_0
 	db ($2 << 4) ; trainer's view range
diff --git a/scripts/pokemontower5.asm b/scripts/PokemonTower5F.asm
index 82b912b5..299261e9 100755
--- a/scripts/pokemontower5.asm
+++ b/scripts/PokemonTower5F.asm
@@ -1,13 +1,13 @@
-PokemonTower5Script:
+PokemonTower5F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, PokemonTower5TrainerHeaders
-	ld de, PokemonTower5ScriptPointers
-	ld a, [wPokemonTower5CurScript]
+	ld hl, PokemonTower5TrainerHeader0
+	ld de, PokemonTower5F_ScriptPointers
+	ld a, [wPokemonTower5FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wPokemonTower5CurScript], a
+	ld [wPokemonTower5FCurScript], a
 	ret
 
-PokemonTower5ScriptPointers:
+PokemonTower5F_ScriptPointers:
 	dw PokemonTower5Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -48,7 +48,7 @@ CoordsData_60992:
 	db $09,$0B
 	db $FF
 
-PokemonTower5TextPointers:
+PokemonTower5F_TextPointers:
 	dw PokemonTower5Text1
 	dw PokemonTower5Text2
 	dw PokemonTower5Text3
@@ -57,7 +57,6 @@ PokemonTower5TextPointers:
 	dw PickUpItemText
 	dw PokemonTower5Text7
 
-PokemonTower5TrainerHeaders:
 PokemonTower5TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_5_TRAINER_0
 	db ($2 << 4) ; trainer's view range
diff --git a/scripts/pokemontower6.asm b/scripts/PokemonTower6F.asm
index 82c39a41..14c07c48 100755
--- a/scripts/pokemontower6.asm
+++ b/scripts/PokemonTower6F.asm
@@ -1,20 +1,20 @@
-PokemonTower6Script:
+PokemonTower6F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, PokemonTower6TrainerHeaders
-	ld de, PokemonTower6ScriptPointers
-	ld a, [wPokemonTower6CurScript]
+	ld hl, PokemonTower6TrainerHeader0
+	ld de, PokemonTower6F_ScriptPointers
+	ld a, [wPokemonTower6FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wPokemonTower6CurScript], a
+	ld [wPokemonTower6FCurScript], a
 	ret
 
 PokemonTower6Script_60b02:
 	xor a
 	ld [wJoyIgnore], a
-	ld [wPokemonTower6CurScript], a
+	ld [wPokemonTower6FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-PokemonTower6ScriptPointers:
+PokemonTower6F_ScriptPointers:
 	dw PokemonTower6Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -37,7 +37,7 @@ PokemonTower6Script0:
 	ld a, 30
 	ld [wCurEnemyLVL], a
 	ld a, $4
-	ld [wPokemonTower6CurScript], a
+	ld [wPokemonTower6FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -66,7 +66,7 @@ PokemonTower6Script4:
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $0
-	ld [wPokemonTower6CurScript], a
+	ld [wPokemonTower6FCurScript], a
 	ld [wCurMapScript], a
 	ret
 .asm_60b82
@@ -80,7 +80,7 @@ PokemonTower6Script4:
 	ld hl, wd730
 	set 7, [hl]
 	ld a, $3
-	ld [wPokemonTower6CurScript], a
+	ld [wPokemonTower6FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -90,11 +90,11 @@ PokemonTower6Script3:
 	ret nz
 	call Delay3
 	xor a
-	ld [wPokemonTower6CurScript], a
+	ld [wPokemonTower6FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-PokemonTower6TextPointers:
+PokemonTower6F_TextPointers:
 	dw PokemonTower6Text1
 	dw PokemonTower6Text2
 	dw PokemonTower6Text3
@@ -103,7 +103,6 @@ PokemonTower6TextPointers:
 	dw PokemonTower6Text6
 	dw PokemonTower6Text7
 
-PokemonTower6TrainerHeaders:
 PokemonTower6TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_POKEMONTOWER_6_TRAINER_0
 	db ($3 << 4) ; trainer's view range
diff --git a/scripts/pokemontower7.asm b/scripts/PokemonTower7F.asm
index abfb1468..e34edf66 100755
--- a/scripts/pokemontower7.asm
+++ b/scripts/PokemonTower7F.asm
@@ -1,18 +1,18 @@
-PokemonTower7Script:
+PokemonTower7F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, PokemonTower7ScriptPointers
-	ld a, [wPokemonTower7CurScript]
-	call JumpTable
+	ld hl, PokemonTower7F_ScriptPointers
+	ld a, [wPokemonTower7FCurScript]
+	call CallFunctionInTable
 	ret
 
 PokemonTower7Script_60d01:
 	xor a
 	ld [wJoyIgnore], a
 PokemonTower7Script_60d05:
-	ld [wPokemonTower7CurScript], a
+	ld [wPokemonTower7FCurScript], a
 	ret
 
-PokemonTower7ScriptPointers:
+PokemonTower7F_ScriptPointers:
 	dw PokemonTower7Script0
 	dw PokemonTower7Script1
 	dw PokemonTower7Script2
@@ -52,9 +52,9 @@ PokemonTower7Script_60d2a:
 	ld [hJoyHeld], a
 	ld a, $FF ^ (A_BUTTON | B_BUTTON)
 	ld [wJoyIgnore], a
-	ld a, HS_POKEMONTOWER_7_JESSIE
+	ld a, HS_POKEMON_TOWER_7F_JESSIE
 	call PokemonTower7Script_60eaf
-	ld a, HS_POKEMONTOWER_7_JAMES
+	ld a, HS_POKEMON_TOWER_7F_JAMES
 	call PokemonTower7Script_60eaf
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
@@ -195,9 +195,9 @@ PokemonTower7Script9:
 	ld a, $ff
 	ld [wJoyIgnore], a
 	call GBFadeOutToBlack
-	ld a, HS_POKEMONTOWER_7_JESSIE
+	ld a, HS_POKEMON_TOWER_7F_JESSIE
 	call PokemonTower7Script_60ebe
-	ld a, HS_POKEMONTOWER_7_JAMES
+	ld a, HS_POKEMON_TOWER_7F_JAMES
 	call PokemonTower7Script_60ebe
 	call UpdateSprites
 	call Delay3
@@ -231,12 +231,12 @@ PokemonTower7Script_60ebe
 PokemonTower7Script11:
 	ld a, $ff
 	ld [wJoyIgnore], a
-	ld a, HS_POKEMONTOWER_7_MR_FUJI
+	ld a, HS_POKEMON_TOWER_7F_MR_FUJI
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	ld a, SPRITE_FACING_UP
 	ld [wSpritePlayerStateData1FacingDirection], a
-	ld a, LAVENDER_HOUSE_1
+	ld a, MR_FUJIS_HOUSE
 	ld [hWarpDestinationMap], a
 	ld a, $1
 	ld [wDestinationWarpID], a
@@ -245,10 +245,10 @@ PokemonTower7Script11:
 	ld hl, wd72d
 	set 3, [hl]
 	ld a, $0
-	ld [wPokemonTower7CurScript], a
+	ld [wPokemonTower7FCurScript], a
 	ret
 
-PokemonTower7TextPointers:
+PokemonTower7F_TextPointers:
 	dw PokemonTower7Text1
 	dw PokemonTower7Text2
 	dw PokemonTower7Text3
@@ -297,7 +297,7 @@ PokemonTower7Text3:
 	call PrintText
 	SetEvent EVENT_RESCUED_MR_FUJI
 	SetEvent EVENT_RESCUED_MR_FUJI_2
-	ld a, HS_LAVENDER_HOUSE_1_MR_FUJI
+	ld a, HS_MR_FUJIS_HOUSE_MR_FUJI
 	ld [wMissableObjectIndex], a
 	predef ShowObject
 	ld a, HS_SAFFRON_CITY_E
@@ -307,7 +307,7 @@ PokemonTower7Text3:
 	ld [wMissableObjectIndex], a
 	predef ShowObject
 	ld a, $b
-	ld [wPokemonTower7CurScript], a
+	ld [wPokemonTower7FCurScript], a
 	jp TextScriptEnd
 
 PokemonTower7Text_60f75:
diff --git a/scripts/powerplant.asm b/scripts/PowerPlant.asm
index c7a5625f..f720b6f8 100755
--- a/scripts/powerplant.asm
+++ b/scripts/PowerPlant.asm
@@ -1,18 +1,18 @@
-PowerPlantScript:
+PowerPlant_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, PowerPlantTrainerHeaders
-	ld de, .ScriptPointers
+	ld hl, Voltorb0TrainerHeader
+	ld de, PowerPlant_ScriptPointers
 	ld a, [wPowerPlantCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wPowerPlantCurScript], a
 	ret
 
-.ScriptPointers
+PowerPlant_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-PowerPlantTextPointers:
+PowerPlant_TextPointers:
 	dw Voltorb0Text
 	dw Voltorb1Text
 	dw Voltorb2Text
@@ -28,7 +28,6 @@ PowerPlantTextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
-PowerPlantTrainerHeaders:
 Voltorb0TrainerHeader:
 	dbEventFlagBit EVENT_BEAT_POWER_PLANT_VOLTORB_0
 	db 0 ; view range
diff --git a/scripts/redshouse1f.asm b/scripts/RedsHouse1F.asm
index c302462d..e4fa2094 100755
--- a/scripts/redshouse1f.asm
+++ b/scripts/RedsHouse1F.asm
@@ -1,8 +1,8 @@
-RedsHouse1FScript:
+RedsHouse1F_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-RedsHouse1FTextPointers:
+RedsHouse1F_TextPointers:
 	dw RedsHouse1FText1
 	dw RedsHouse1FText2
 
diff --git a/scripts/redshouse1f2.asm b/scripts/RedsHouse1F2.asm
index 8f44d30d..8f44d30d 100755
--- a/scripts/redshouse1f2.asm
+++ b/scripts/RedsHouse1F2.asm
diff --git a/scripts/redshouse2f.asm b/scripts/RedsHouse2F.asm
index 0945e901..e692a0fa 100755
--- a/scripts/redshouse2f.asm
+++ b/scripts/RedsHouse2F.asm
@@ -1,11 +1,11 @@
-RedsHouse2FScript:
+RedsHouse2F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, RedsHouse2FScriptPointers
+	ld hl, RedsHouse2F_ScriptPointers
 	ld a, 0
-	call JumpTable
+	call CallFunctionInTable
 	ret
 
-RedsHouse2FScriptPointers:
+RedsHouse2F_ScriptPointers:
 	dw RedsHouse2FScript0
 	dw RedsHouse2FScript1
 	dw RedsHouse2FScript2
@@ -19,5 +19,5 @@ RedsHouse2FScript3:
 RedsHouse2FScript4:
 	ret
 
-RedsHouse2FTextPointers:
+RedsHouse2F_TextPointers:
 	db "@"
diff --git a/scripts/rocktunnel1.asm b/scripts/RockTunnel1F.asm
index 2819c350..94620d96 100755
--- a/scripts/rocktunnel1.asm
+++ b/scripts/RockTunnel1F.asm
@@ -1,18 +1,18 @@
-RockTunnel1Script:
+RockTunnel1F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, RockTunnel1TrainerHeaders
-	ld de, RockTunnel1ScriptPointers
-	ld a, [wRockTunnel1CurScript]
+	ld hl, RockTunnel1TrainerHeader0
+	ld de, RockTunnel1F_ScriptPointers
+	ld a, [wRockTunnel1FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wRockTunnel1CurScript], a
+	ld [wRockTunnel1FCurScript], a
 	ret
 
-RockTunnel1ScriptPointers:
+RockTunnel1F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-RockTunnel1TextPointers:
+RockTunnel1F_TextPointers:
 	dw RockTunnel1Text1
 	dw RockTunnel1Text2
 	dw RockTunnel1Text3
@@ -22,65 +22,64 @@ RockTunnel1TextPointers:
 	dw RockTunnel1Text7
 	dw RockTunnel1Text8
 
-RockTunnel1TrainerHeaders:
-RockTunnel1TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1
+RockTunnel1TrainerHeader0:
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_0
 	dw RockTunnel1BattleText1 ; TextBeforeBattle
 	dw RockTunnel1AfterBattleText1 ; TextAfterBattle
 	dw RockTunnel1EndBattleText1 ; TextEndBattle
 	dw RockTunnel1EndBattleText1 ; TextEndBattle
 
-RockTunnel1TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2
+RockTunnel1TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_1
 	dw RockTunnel1BattleText2 ; TextBeforeBattle
 	dw RockTunnel1AfterBattleText2 ; TextAfterBattle
 	dw RockTunnel1EndBattleText2 ; TextEndBattle
 	dw RockTunnel1EndBattleText2 ; TextEndBattle
 
-RockTunnel1TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3
+RockTunnel1TrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_2
 	dw RockTunnel1BattleText3 ; TextBeforeBattle
 	dw RockTunnel1AfterBattleText3 ; TextAfterBattle
 	dw RockTunnel1EndBattleText3 ; TextEndBattle
 	dw RockTunnel1EndBattleText3 ; TextEndBattle
 
-RockTunnel1TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4
+RockTunnel1TrainerHeader3:
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_3
 	dw RockTunnel1BattleText4 ; TextBeforeBattle
 	dw RockTunnel1AfterBattleText4 ; TextAfterBattle
 	dw RockTunnel1EndBattleText4 ; TextEndBattle
 	dw RockTunnel1EndBattleText4 ; TextEndBattle
 
-RockTunnel1TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5
+RockTunnel1TrainerHeader4:
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_4
 	dw RockTunnel1BattleText5 ; TextBeforeBattle
 	dw RockTunnel1AfterBattleText5 ; TextAfterBattle
 	dw RockTunnel1EndBattleText5 ; TextEndBattle
 	dw RockTunnel1EndBattleText5 ; TextEndBattle
 
-RockTunnel1TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6
+RockTunnel1TrainerHeader5:
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_5
 	dw RockTunnel1BattleText6 ; TextBeforeBattle
 	dw RockTunnel1AfterBattleText6 ; TextAfterBattle
 	dw RockTunnel1EndBattleText6 ; TextEndBattle
 	dw RockTunnel1EndBattleText6 ; TextEndBattle
 
-RockTunnel1TrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_7
+RockTunnel1TrainerHeader6:
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_7
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_1_TRAINER_6
 	dw RockTunnel1BattleText7 ; TextBeforeBattle
 	dw RockTunnel1AfterBattleText7 ; TextAfterBattle
 	dw RockTunnel1EndBattleText7 ; TextEndBattle
@@ -90,37 +89,37 @@ RockTunnel1TrainerHeader7:
 
 RockTunnel1Text1:
 	TX_ASM
-	ld hl, RockTunnel1TrainerHeader1
+	ld hl, RockTunnel1TrainerHeader0
 	jr RockTunnel1TalkToTrainer
 
 RockTunnel1Text2:
 	TX_ASM
-	ld hl, RockTunnel1TrainerHeader2
+	ld hl, RockTunnel1TrainerHeader1
 	jr RockTunnel1TalkToTrainer
 
 RockTunnel1Text3:
 	TX_ASM
-	ld hl, RockTunnel1TrainerHeader3
+	ld hl, RockTunnel1TrainerHeader2
 	jr RockTunnel1TalkToTrainer
 
 RockTunnel1Text4:
 	TX_ASM
-	ld hl, RockTunnel1TrainerHeader4
+	ld hl, RockTunnel1TrainerHeader3
 	jr RockTunnel1TalkToTrainer
 
 RockTunnel1Text5:
 	TX_ASM
-	ld hl, RockTunnel1TrainerHeader5
+	ld hl, RockTunnel1TrainerHeader4
 	jr RockTunnel1TalkToTrainer
 
 RockTunnel1Text6:
 	TX_ASM
-	ld hl, RockTunnel1TrainerHeader6
+	ld hl, RockTunnel1TrainerHeader5
 	jr RockTunnel1TalkToTrainer
 
 RockTunnel1Text7:
 	TX_ASM
-	ld hl, RockTunnel1TrainerHeader7
+	ld hl, RockTunnel1TrainerHeader6
 RockTunnel1TalkToTrainer:
 	call TalkToTrainer
 	jp TextScriptEnd
diff --git a/scripts/rocktunnel2.asm b/scripts/RockTunnelB1F.asm
index 7ac3f426..7e6fcc8b 100755
--- a/scripts/rocktunnel2.asm
+++ b/scripts/RockTunnelB1F.asm
@@ -1,18 +1,18 @@
-RockTunnel2Script:
+RockTunnelB1F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, RockTunnel2TrainerHeaders
-	ld de, RockTunnel2ScriptPointers
-	ld a, [wRockTunnel2CurScript]
+	ld hl, RockTunnel2TrainerHeader0
+	ld de, RockTunnelB1F_ScriptPointers
+	ld a, [wRockTunnelB1FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wRockTunnel2CurScript], a
+	ld [wRockTunnelB1FCurScript], a
 	ret
 
-RockTunnel2ScriptPointers:
+RockTunnelB1F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-RockTunnel2TextPointers:
+RockTunnelB1F_TextPointers:
 	dw RockTunnel2Text1
 	dw RockTunnel2Text2
 	dw RockTunnel2Text3
@@ -22,7 +22,6 @@ RockTunnel2TextPointers:
 	dw RockTunnel2Text7
 	dw RockTunnel2Text8
 
-RockTunnel2TrainerHeaders:
 RockTunnel2TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_0
 	db ($4 << 4) ; trainer's view range
@@ -32,64 +31,64 @@ RockTunnel2TrainerHeader0:
 	dw RockTunnel2EndBattleText2 ; TextEndBattle
 	dw RockTunnel2EndBattleText2 ; TextEndBattle
 
-RockTunnel2TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2
+RockTunnel2TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_1
 	dw RockTunnel2BattleText3 ; TextBeforeBattle
 	dw RockTunnel2AfterBattleText3 ; TextAfterBattle
 	dw RockTunnel2EndBattleText3 ; TextEndBattle
 	dw RockTunnel2EndBattleText3 ; TextEndBattle
 
-RockTunnel2TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3
+RockTunnel2TrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_2
 	dw RockTunnel2BattleText4 ; TextBeforeBattle
 	dw RockTunnel2AfterBattleText4 ; TextAfterBattle
 	dw RockTunnel2EndBattleText4 ; TextEndBattle
 	dw RockTunnel2EndBattleText4 ; TextEndBattle
 
-RockTunnel2TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4
+RockTunnel2TrainerHeader3:
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_3
 	dw RockTunnel2BattleText5 ; TextBeforeBattle
 	dw RockTunnel2AfterBattleText5 ; TextAfterBattle
 	dw RockTunnel2EndBattleText5 ; TextEndBattle
 	dw RockTunnel2EndBattleText5 ; TextEndBattle
 
-RockTunnel2TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5
+RockTunnel2TrainerHeader4:
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_4
 	dw RockTunnel2BattleText6 ; TextBeforeBattle
 	dw RockTunnel2AfterBattleText6 ; TextAfterBattle
 	dw RockTunnel2EndBattleText6 ; TextEndBattle
 	dw RockTunnel2EndBattleText6 ; TextEndBattle
 
-RockTunnel2TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6
+RockTunnel2TrainerHeader5:
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_5
 	dw RockTunnel2BattleText7 ; TextBeforeBattle
 	dw RockTunnel2AfterBattleText7 ; TextAfterBattle
 	dw RockTunnel2EndBattleText7 ; TextEndBattle
 	dw RockTunnel2EndBattleText7 ; TextEndBattle
 
-RockTunnel2TrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7
+RockTunnel2TrainerHeader6:
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_6
 	dw RockTunnel2BattleText8 ; TextBeforeBattle
 	dw RockTunnel2AfterBattleText8 ; TextAfterBattle
 	dw RockTunnel2EndBattleText8 ; TextEndBattle
 	dw RockTunnel2EndBattleText8 ; TextEndBattle
 
-RockTunnel2TrainerHeader8:
-	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_8, 1
+RockTunnel2TrainerHeader7:
+	dbEventFlagBit EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_8, 1
+	dwEventFlagAddress EVENT_BEAT_ROCK_TUNNEL_2_TRAINER_7, 1
 	dw RockTunnel2BattleText9 ; TextBeforeBattle
 	dw RockTunnel2AfterBattleText9 ; TextAfterBattle
 	dw RockTunnel2EndBattleText9 ; TextEndBattle
@@ -105,43 +104,43 @@ RockTunnel2Text1:
 
 RockTunnel2Text2:
 	TX_ASM
-	ld hl, RockTunnel2TrainerHeader2
+	ld hl, RockTunnel2TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RockTunnel2Text3:
 	TX_ASM
-	ld hl, RockTunnel2TrainerHeader3
+	ld hl, RockTunnel2TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RockTunnel2Text4:
 	TX_ASM
-	ld hl, RockTunnel2TrainerHeader4
+	ld hl, RockTunnel2TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RockTunnel2Text5:
 	TX_ASM
-	ld hl, RockTunnel2TrainerHeader5
+	ld hl, RockTunnel2TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RockTunnel2Text6:
 	TX_ASM
-	ld hl, RockTunnel2TrainerHeader6
+	ld hl, RockTunnel2TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RockTunnel2Text7:
 	TX_ASM
-	ld hl, RockTunnel2TrainerHeader7
+	ld hl, RockTunnel2TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RockTunnel2Text8:
 	TX_ASM
-	ld hl, RockTunnel2TrainerHeader8
+	ld hl, RockTunnel2TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
diff --git a/scripts/rocktunnelpokecenter.asm b/scripts/RockTunnelPokecenter.asm
index 68c5f31a..2fcace67 100755
--- a/scripts/rocktunnelpokecenter.asm
+++ b/scripts/RockTunnelPokecenter.asm
@@ -1,8 +1,8 @@
-RockTunnelPokecenterScript:
+RockTunnelPokecenter_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-RockTunnelPokecenterTextPointers:
+RockTunnelPokecenter_TextPointers:
 	dw RockTunnelHealNurseText
 	dw RockTunnelPokecenterText2
 	dw RockTunnelPokecenterText3
diff --git a/scripts/rockethideout1.asm b/scripts/RocketHideoutB1F.asm
index 35c9026a..0cbddb49 100755
--- a/scripts/rockethideout1.asm
+++ b/scripts/RocketHideoutB1F.asm
@@ -1,11 +1,11 @@
-RocketHideout1Script:
+RocketHideoutB1F_Script:
 	call RocketHideout1Script_44be0
 	call EnableAutoTextBoxDrawing
-	ld hl, RocketHideout1TrainerHeaders
-	ld de, RocketHideout1ScriptPointers
-	ld a, [wRocketHideout1CurScript]
+	ld hl, RocketHideout1TrainerHeader0
+	ld de, RocketHideoutB1F_ScriptPointers
+	ld a, [wRocketHideoutB1FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wRocketHideout1CurScript], a
+	ld [wRocketHideoutB1FCurScript], a
 	ret
 
 RocketHideout1Script_44be0:
@@ -15,7 +15,7 @@ RocketHideout1Script_44be0:
 	ret z
 	CheckEvent EVENT_677
 	jr nz, .asm_44c01
-	CheckEventReuseA EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5
+	CheckEventReuseA EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4
 	jr nz, .asm_44bf7
 	ld a, $54
 	jr .asm_44c03
@@ -30,12 +30,12 @@ RocketHideout1Script_44be0:
 	lb bc, 8, 12
 	predef_jump ReplaceTileBlock
 
-RocketHideout1ScriptPointers:
+RocketHideoutB1F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-RocketHideout1TextPointers:
+RocketHideoutB1F_TextPointers:
 	dw RocketHideout1Text1
 	dw RocketHideout1Text2
 	dw RocketHideout1Text3
@@ -44,7 +44,6 @@ RocketHideout1TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
-RocketHideout1TrainerHeaders:
 RocketHideout1TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0
 	db ($3 << 4) ; trainer's view range
@@ -54,37 +53,37 @@ RocketHideout1TrainerHeader0:
 	dw RocketHideout1EndBattleText2 ; TextEndBattle
 	dw RocketHideout1EndBattleText2 ; TextEndBattle
 
-RocketHideout1TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2
+RocketHideout1TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1
 	dw RocketHideout1BattleText3 ; TextBeforeBattle
 	dw RocketHideout1AfterBattleTxt3 ; TextAfterBattle
 	dw RocketHideout1EndBattleText3 ; TextEndBattle
 	dw RocketHideout1EndBattleText3 ; TextEndBattle
 
-RocketHideout1TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3
+RocketHideout1TrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2
 	dw RocketHideout1BattleText4 ; TextBeforeBattle
 	dw RocketHideout1AfterBattleTxt4 ; TextAfterBattle
 	dw RocketHideout1EndBattleText4 ; TextEndBattle
 	dw RocketHideout1EndBattleText4 ; TextEndBattle
 
-RocketHideout1TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4
+RocketHideout1TrainerHeader3:
+	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3
 	dw RocketHideout1BattleText5 ; TextBeforeBattle
 	dw RocketHideout1AfterBattleTxt5 ; TextAfterBattle
 	dw RocketHideout1EndBattleText5 ; TextEndBattle
 	dw RocketHideout1EndBattleText5 ; TextEndBattle
 
-RocketHideout1TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5
+RocketHideout1TrainerHeader4:
+	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4
 	dw RocketHideout1BattleText6 ; TextBeforeBattle
 	dw RocketHideout1AfterBattleTxt6 ; TextAfterBattle
 	dw RocketHideout1EndBattleText6 ; TextEndBattle
@@ -100,37 +99,38 @@ RocketHideout1Text1:
 
 RocketHideout1Text2:
 	TX_ASM
-	ld hl, RocketHideout1TrainerHeader2
+	ld hl, RocketHideout1TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RocketHideout1Text3:
 	TX_ASM
-	ld hl, RocketHideout1TrainerHeader3
+	ld hl, RocketHideout1TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RocketHideout1Text4:
 	TX_ASM
-	ld hl, RocketHideout1TrainerHeader4
+	ld hl, RocketHideout1TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RocketHideout1Text5:
 	TX_ASM
-	ld hl, RocketHideout1TrainerHeader5
+	ld hl, RocketHideout1TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
 RocketHideout1EndBattleText6:
 	TX_FAR _RocketHideout1EndBattleText6
 	TX_ASM
-	SetEvent EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5
+	SetEvent EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4
 	ld hl, RocketHideout1Text_44c9f
 	ret
 
 RocketHideout1Text_44c9f:
-	db $6, "@"
+	TX_BLINK
+	db "@"
 
 RocketHideout1BattleText2:
 	TX_FAR _RocketHideout1BattleText2
diff --git a/scripts/rockethideout2.asm b/scripts/RocketHideoutB2F.asm
index b29e5396..1b487df2 100755
--- a/scripts/rockethideout2.asm
+++ b/scripts/RocketHideoutB2F.asm
@@ -1,13 +1,13 @@
-RocketHideout2Script:
+RocketHideoutB2F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, RocketHideout2TrainerHeaders
-	ld de, RocketHideout2ScriptPointers
-	ld a, [wRocketHideout2CurScript]
+	ld hl, RocketHideout2TrainerHeader0
+	ld de, RocketHideoutB2F_ScriptPointers
+	ld a, [wRocketHideoutB2FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wRocketHideout2CurScript], a
+	ld [wRocketHideoutB2FCurScript], a
 	ret
 
-RocketHideout2ScriptPointers:
+RocketHideoutB2F_ScriptPointers:
 	dw RocketHideout2Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -413,14 +413,13 @@ SpinnerPlayerFacingDirections:
 SpinnerArrowAnimTiles:
 	INCBIN "gfx/spinner_arrow.2bpp"
 
-RocketHideout2TextPointers:
+RocketHideoutB2F_TextPointers:
 	dw RocketHideout2Text1
 	dw PickUpItemText
 	dw PickUpItemText
 	dw PickUpItemText
 	dw PickUpItemText
 
-RocketHideout2TrainerHeaders:
 RocketHideout2TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0
 	db ($4 << 4) ; trainer's view range
diff --git a/scripts/rockethideout3.asm b/scripts/RocketHideoutB3F.asm
index ac08e868..4dd537b3 100755
--- a/scripts/rockethideout3.asm
+++ b/scripts/RocketHideoutB3F.asm
@@ -1,13 +1,13 @@
-RocketHideout3Script:
+RocketHideoutB3F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, RocketHideout3TrainerHeaders
-	ld de, RocketHideout3ScriptPointers
-	ld a, [wRocketHideout3CurScript]
+	ld hl, RocketHideout3TrainerHeader0
+	ld de, RocketHideoutB3F_ScriptPointers
+	ld a, [wRocketHideoutB3FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wRocketHideout3CurScript], a
+	ld [wRocketHideoutB3FCurScript], a
 	ret
 
-RocketHideout3ScriptPointers:
+RocketHideoutB3F_ScriptPointers:
 	dw RocketHideout3Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -143,13 +143,12 @@ RocketHideout3Script3:
 	ld [wCurMapScript], a
 	ret
 
-RocketHideout3TextPointers:
+RocketHideoutB3F_TextPointers:
 	dw RocketHideout3Text1
 	dw RocketHideout3Text2
 	dw PickUpItemText
 	dw PickUpItemText
 
-RocketHideout3TrainerHeaders:
 RocketHideout3TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0
 	db ($2 << 4) ; trainer's view range
@@ -159,10 +158,10 @@ RocketHideout3TrainerHeader0:
 	dw RocketHideout3EndBattleText2 ; TextEndBattle
 	dw RocketHideout3EndBattleText2 ; TextEndBattle
 
-RocketHideout3TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_2
+RocketHideout3TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1
 	dw RocketHideout3BattleTxt ; TextBeforeBattle
 	dw RocketHideout3AfterBattleText3 ; TextAfterBattle
 	dw RocketHideout3EndBattleText3 ; TextEndBattle
@@ -190,7 +189,7 @@ RocketHideout3AfterBattleTxt2:
 
 RocketHideout3Text2:
 	TX_ASM
-	ld hl, RocketHideout3TrainerHeader2
+	ld hl, RocketHideout3TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
diff --git a/scripts/rockethideout4.asm b/scripts/RocketHideoutB4F.asm
index 1781b12e..89fd37e1 100755
--- a/scripts/rockethideout4.asm
+++ b/scripts/RocketHideoutB4F.asm
@@ -1,10 +1,10 @@
-RocketHideout4Script:
+RocketHideoutB4F_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, RocketHideout4TrainerHeader0
-	ld de, RocketHideout4ScriptPointers
-	ld a, [wRocketHideout4CurScript]
+	ld de, RocketHideoutB4F_ScriptPointers
+	ld a, [wRocketHideoutB4FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wRocketHideout4CurScript], a
+	ld [wRocketHideoutB4FCurScript], a
 	ret
 
 RocketHideout4Script_45510:
@@ -13,18 +13,18 @@ RocketHideout4Script_45510:
 	xor a
 	ld [wJoyIgnore], a
 RocketHideout4Script_4551e:
-	ld [wRocketHideout4CurScript], a
+	ld [wRocketHideoutB4FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
 RocketHideout4Script_45525:
-	ld a, HS_ROCKET_HIDEOUT_4_JAMES
+	ld a, HS_ROCKET_HIDEOUT_B4F_JAMES
 	call RocketHideout4Script_45756
-	ld a, HS_ROCKET_HIDEOUT_4_JESSIE
+	ld a, HS_ROCKET_HIDEOUT_B4F_JESSIE
 	call RocketHideout4Script_45756
 	ret
 
-RocketHideout4ScriptPointers:
+RocketHideoutB4F_ScriptPointers:
 	dw RocketHideout4Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -51,10 +51,10 @@ RocketHideout4Script3:
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	call GBFadeOutToBlack
-	ld a, HS_ROCKET_HIDEOUT_4_GIOVANNI
+	ld a, HS_ROCKET_HIDEOUT_B4F_GIOVANNI
 	ld [wMissableObjectIndex], a
 	predef HideObject
-	ld a, HS_ROCKET_HIDEOUT_4_ITEM_4
+	ld a, HS_ROCKET_HIDEOUT_B4F_ITEM_4
 	ld [wMissableObjectIndex], a
 	predef ShowObject
 	call UpdateSprites
@@ -64,14 +64,14 @@ RocketHideout4Script3:
 	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
 	ld a, $0
-	ld [wRocketHideout4CurScript], a
+	ld [wRocketHideoutB4FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
 RocketHideout4Script0:
 	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0
 	call z, RocketHideout4Script_455a5
-	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3
+	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
 	call z, CheckFightingMapTrainers
 	ret
 
@@ -79,14 +79,14 @@ RocketHideout4Script_455a5:
 	ld a, [wYCoord]
 	cp $e
 	ret nz
-	ResetEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
+	ResetEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
 	ld a, [wXCoord]
 	cp $18
 	jr z, .asm_455c2
 	ld a, [wXCoord]
 	cp $19
 	ret nz
-	SetEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
+	SetEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
 .asm_455c2
 	xor a
 	ld [hJoyHeld], a
@@ -109,9 +109,9 @@ RocketHideout4Script_455a5:
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld a, $ff
 	ld [wJoyIgnore], a
-	ld a, HS_ROCKET_HIDEOUT_4_JAMES
+	ld a, HS_ROCKET_HIDEOUT_B4F_JAMES
 	call RocketHideout4Script_45747
-	ld a, HS_ROCKET_HIDEOUT_4_JESSIE
+	ld a, HS_ROCKET_HIDEOUT_B4F_JESSIE
 	call RocketHideout4Script_45747
 	ld a, $4
 	call RocketHideout4Script_4551e
@@ -127,7 +127,7 @@ RocketHideout4JessieJamesMovementData_45606:
 
 RocketHideout4Script4:
 	ld de, RocketHideout4JessieJamesMovementData_45605
-	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
+	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
 	jr z, .asm_45617
 	ld de, RocketHideout4JessieJamesMovementData_45606
 .asm_45617
@@ -151,7 +151,7 @@ RocketHideout4Script6:
 	ld [wSpriteStateData1 + 2 * $10 + 1], a
 	ld a, SPRITE_FACING_LEFT
 	ld [wSpriteStateData1 + 2 * $10 + 9], a
-	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
+	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
 	jr z, .asm_4564a
 	ld a, SPRITE_FACING_DOWN
 	ld [wSpriteStateData1 + 2 * $10 + 9], a
@@ -161,7 +161,7 @@ RocketHideout4Script6:
 	ld [wJoyIgnore], a
 RocketHideout4Script7:
 	ld de, RocketHideout4JessieJamesMovementData_45606
-	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
+	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
 	jr z, .asm_4565f
 	ld de, RocketHideout4JessieJamesMovementData_45605
 .asm_4565f
@@ -187,7 +187,7 @@ RocketHideout4Script9:
 	ld [wSpriteStateData1 + 3 * $10 + 1], a
 	ld a, SPRITE_FACING_DOWN
 	ld [wSpriteStateData1 + 3 * $10 + 9], a
-	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
+	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_1
 	jr z, .asm_45697
 	ld a, SPRITE_FACING_RIGHT
 	ld [wSpriteStateData1 + 3 * $10 + 9], a
@@ -250,9 +250,9 @@ RocketHideout4Script12:
 	ld a, $ff
 	ld [wJoyIgnore], a
 	call GBFadeOutToBlack
-	ld a, HS_ROCKET_HIDEOUT_4_JAMES
+	ld a, HS_ROCKET_HIDEOUT_B4F_JAMES
 	call RocketHideout4Script_45756
-	ld a, HS_ROCKET_HIDEOUT_4_JESSIE
+	ld a, HS_ROCKET_HIDEOUT_B4F_JESSIE
 	call RocketHideout4Script_45756
 	call UpdateSprites
 	call Delay3
@@ -283,7 +283,7 @@ RocketHideout4Script_45756:
 	predef HideObject
 	ret
 
-RocketHideout4TextPointers:
+RocketHideoutB4F_TextPointers:
 	dw RocketHideout4Text0
 	dw RocketHideout4Text1
 	dw RocketHideout4Text2
@@ -298,11 +298,10 @@ RocketHideout4TextPointers:
 	dw RocketHideout4Text11
 	dw RocketHideout4Text12
 
-RocketHideout4TrainerHeaders:
 RocketHideout4TrainerHeader0:
-	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3
+	dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
 	db ($1 << 4)
-	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
 	dw RocketHideout4Trainer0BeforeText
 	dw RocketHideout4Trainer0AfterText
 	dw RocketHideout4Trainer0EndBattleText
@@ -363,7 +362,7 @@ RocketHideout4Text0:
 	xor a
 	ld [hJoyHeld], a
 	ld a, $3
-	ld [wRocketHideout4CurScript], a
+	ld [wRocketHideoutB4FCurScript], a
 	ld [wCurMapScript], a
 	jr .asm_45801
 
@@ -397,10 +396,10 @@ RocketHideout4Trainer0BeforeText:
 
 RocketHideout4Trainer0EndBattleText:
 	TX_FAR _RocketHideout4EndBattleText4
-	TX_BUTTON_SOUND
+	TX_BLINK
 	TX_ASM
 	SetEvent EVENT_ROCKET_DROPPED_LIFT_KEY
-	ld a, HS_ROCKET_HIDEOUT_4_ITEM_5
+	ld a, HS_ROCKET_HIDEOUT_B4F_ITEM_5
 	ld [wMissableObjectIndex], a
 	predef ShowObject
 	jp TextScriptEnd
diff --git a/scripts/rockethideoutelevator.asm b/scripts/RocketHideoutElevator.asm
index 526ac3cc..9525db3a 100755
--- a/scripts/rockethideoutelevator.asm
+++ b/scripts/RocketHideoutElevator.asm
@@ -1,4 +1,4 @@
-RocketHideoutElevatorScript:
+RocketHideoutElevator_Script:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -51,9 +51,9 @@ RocketHideoutElevatorWarpMaps:
 ; first byte is warp number
 ; second byte is map number
 ; These specify where the player goes after getting out of the elevator.
-	db $04, ROCKET_HIDEOUT_1
-	db $04, ROCKET_HIDEOUT_2
-	db $02, ROCKET_HIDEOUT_4
+	db $04, ROCKET_HIDEOUT_B1F
+	db $04, ROCKET_HIDEOUT_B2F
+	db $02, ROCKET_HIDEOUT_B4F
 RocketHideoutElevatorWarpMapsEnd:
 
 RocketHideoutElevatorScript_4575f:
@@ -61,7 +61,7 @@ RocketHideoutElevatorScript_4575f:
 	callba ShakeElevator
 	ret
 
-RocketHideoutElevatorTextPointers:
+RocketHideoutElevator_TextPointers:
 	dw RocketHideoutElevatorText1
 
 RocketHideoutElevatorText1:
@@ -81,4 +81,5 @@ RocketHideoutElevatorText1:
 
 RocketHideoutElevatorText_4578b:
 	TX_FAR _RocketElevatorText_4578b
-	db $d, "@"
+	TX_WAIT
+	db "@"
diff --git a/scripts/route1.asm b/scripts/Route1.asm
index 4d046124..d41360b2 100755
--- a/scripts/route1.asm
+++ b/scripts/Route1.asm
@@ -1,8 +1,8 @@
-Route1Script:
+Route1_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-Route1TextPointers:
+Route1_TextPointers:
 	dw Route1Text1
 	dw Route1Text2
 	dw Route1Text3
diff --git a/scripts/route10.asm b/scripts/Route10.asm
index ca0ab190..3fffa2c0 100755
--- a/scripts/route10.asm
+++ b/scripts/Route10.asm
@@ -1,18 +1,18 @@
-Route10Script:
+Route10_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route10TrainerHeaders
-	ld de, Route10ScriptPointers
+	ld hl, Route10TrainerHeader0
+	ld de, Route10_ScriptPointers
 	ld a, [wRoute10CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute10CurScript], a
 	ret
 
-Route10ScriptPointers:
+Route10_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route10TextPointers:
+Route10_TextPointers:
 	dw Route10Text1
 	dw Route10Text2
 	dw Route10Text3
@@ -24,7 +24,6 @@ Route10TextPointers:
 	dw Route10Text9
 	dw Route10Text10
 
-Route10TrainerHeaders:
 Route10TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_0
 	db ($4 << 4) ; trainer's view range
diff --git a/scripts/route11.asm b/scripts/Route11.asm
index ab3509c5..891237cc 100755
--- a/scripts/route11.asm
+++ b/scripts/Route11.asm
@@ -1,18 +1,18 @@
-Route11Script:
+Route11_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route11TrainerHeaders
-	ld de, Route11ScriptPointers
+	ld hl, Route11TrainerHeader0
+	ld de, Route11_ScriptPointers
 	ld a, [wRoute11CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute11CurScript], a
 	ret
 
-Route11ScriptPointers:
+Route11_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route11TextPointers:
+Route11_TextPointers:
 	dw Route11Text1
 	dw Route11Text2
 	dw Route11Text3
@@ -25,7 +25,6 @@ Route11TextPointers:
 	dw Route11Text10
 	dw Route11Text11
 
-Route11TrainerHeaders:
 Route11TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_0
 	db ($3 << 4) ; trainer's view range
diff --git a/scripts/route11gate.asm b/scripts/Route11Gate1F.asm
index 9ecfe0ca..8e5f6c03 100755
--- a/scripts/route11gate.asm
+++ b/scripts/Route11Gate1F.asm
@@ -1,7 +1,7 @@
-Route11GateScript:
+Route11Gate1F_Script:
 	jp EnableAutoTextBoxDrawing
 
-Route11GateTextPointers:
+Route11Gate1F_TextPointers:
 	dw Route11GateText1
 
 Route11GateText1:
diff --git a/scripts/route11gateupstairs.asm b/scripts/Route11Gate2F.asm
index 6188e122..fde7fdd6 100755
--- a/scripts/route11gateupstairs.asm
+++ b/scripts/Route11Gate2F.asm
@@ -1,7 +1,7 @@
-Route11GateUpstairsScript:
+Route11Gate2F_Script:
 	jp DisableAutoTextBoxDrawing
 
-Route11GateUpstairsTextPointers:
+Route11Gate2F_TextPointers:
 	dw Route11GateUpstairsText1
 	dw Route11GateUpstairsText2
 	dw Route11GateUpstairsText3
diff --git a/scripts/route12.asm b/scripts/Route12.asm
index e61f41c0..510e7727 100755
--- a/scripts/route12.asm
+++ b/scripts/Route12.asm
@@ -1,7 +1,7 @@
-Route12Script:
+Route12_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route12TrainerHeaders
-	ld de, Route12ScriptPointers
+	ld hl, Route12TrainerHeader0
+	ld de, Route12_ScriptPointers
 	ld a, [wRoute12CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute12CurScript], a
@@ -14,7 +14,7 @@ Route12Script_59606:
 	ld [wCurMapScript], a
 	ret
 
-Route12ScriptPointers:
+Route12_ScriptPointers:
 	dw Route12Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -60,7 +60,7 @@ Route12Script3:
 	ld [wCurMapScript], a
 	ret
 
-Route12TextPointers:
+Route12_TextPointers:
 	dw Route12Text1
 	dw Route12Text2
 	dw Route12Text3
@@ -76,7 +76,6 @@ Route12TextPointers:
 	dw Route12Text13
 	dw Route12Text14
 
-Route12TrainerHeaders:
 Route12TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_12_TRAINER_0
 	db ($4 << 4) ; trainer's view range
diff --git a/scripts/route12gate.asm b/scripts/Route12Gate1F.asm
index 8474100d..52d427ee 100755
--- a/scripts/route12gate.asm
+++ b/scripts/Route12Gate1F.asm
@@ -1,7 +1,7 @@
-Route12GateScript:
+Route12Gate1F_Script:
 	jp EnableAutoTextBoxDrawing
 
-Route12GateTextPointers:
+Route12Gate1F_TextPointers:
 	dw Route12GateText1
 
 Route12GateText1:
diff --git a/scripts/route12gateupstairs.asm b/scripts/Route12Gate2F.asm
index b80ca186..4fe120e8 100755
--- a/scripts/route12gateupstairs.asm
+++ b/scripts/Route12Gate2F.asm
@@ -1,7 +1,7 @@
-Route12GateUpstairsScript:
+Route12Gate2F_Script:
 	jp DisableAutoTextBoxDrawing
 
-Route12GateUpstairsTextPointers:
+Route12Gate2F_TextPointers:
 	dw Route12GateUpstairsText1
 	dw Route12GateUpstairsText2
 	dw Route12GateUpstairsText3
@@ -35,7 +35,8 @@ TM39PreReceiveText:
 
 ReceivedTM39Text:
 	TX_FAR _ReceivedTM39Text
-	db $0B, "@"
+	TX_SFX_ITEM_1
+	db "@"
 
 TM39ExplanationText:
 	TX_FAR _TM39ExplanationText
diff --git a/scripts/route12house.asm b/scripts/Route12SuperRodHouse.asm
index 7ee86731..de8ed8f0 100755
--- a/scripts/route12house.asm
+++ b/scripts/Route12SuperRodHouse.asm
@@ -1,7 +1,7 @@
-Route12HouseScript:
+Route12SuperRodHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-Route12HouseTextPointers:
+Route12SuperRodHouse_TextPointers:
 	dw Route12HouseText1
 
 Route12HouseText1:
@@ -40,7 +40,7 @@ Route12HouseText_564c0:
 
 Route12HouseText_564c5:
 	TX_FAR _Route12HouseText_564c5
-	db $0B
+	TX_SFX_ITEM_1
 	TX_FAR _Route12HouseText_564ca
 	db "@"
 
diff --git a/scripts/route13.asm b/scripts/Route13.asm
index 61f43ee9..8f92147e 100755
--- a/scripts/route13.asm
+++ b/scripts/Route13.asm
@@ -1,18 +1,18 @@
-Route13Script:
+Route13_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route13TrainerHeaders
-	ld de, Route13ScriptPointers
+	ld hl, Route13TrainerHeader0
+	ld de, Route13_ScriptPointers
 	ld a, [wRoute13CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute13CurScript], a
 	ret
 
-Route13ScriptPointers:
+Route13_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route13TextPointers:
+Route13_TextPointers:
 	dw Route13Text1
 	dw Route13Text2
 	dw Route13Text3
@@ -27,7 +27,6 @@ Route13TextPointers:
 	dw Route13Text12
 	dw Route13Text13
 
-Route13TrainerHeaders:
 Route13TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_0
 	db ($2 << 4) ; trainer's view range
@@ -37,82 +36,82 @@ Route13TrainerHeader0:
 	dw Route13EndBattleText2 ; TextEndBattle
 	dw Route13EndBattleText2 ; TextEndBattle
 
-Route13TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_2
+Route13TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_1
 	dw Route13BattleText3 ; TextBeforeBattle
 	dw Route13AfterBattleText3 ; TextAfterBattle
 	dw Route13EndBattleText3 ; TextEndBattle
 	dw Route13EndBattleText3 ; TextEndBattle
 
-Route13TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_3
+Route13TrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_2
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_2
 	dw Route13BattleText4 ; TextBeforeBattle
 	dw Route13AfterBattleText4 ; TextAfterBattle
 	dw Route13EndBattleText4 ; TextEndBattle
 	dw Route13EndBattleText4 ; TextEndBattle
 
-Route13TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_4
+Route13TrainerHeader3:
+	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_3
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_3
 	dw Route13BattleText5 ; TextBeforeBattle
 	dw Route13AfterBattleText5 ; TextAfterBattle
 	dw Route13EndBattleText5 ; TextEndBattle
 	dw Route13EndBattleText5 ; TextEndBattle
 
-Route13TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_5
+Route13TrainerHeader4:
+	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_4
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_4
 	dw Route13BattleText6 ; TextBeforeBattle
 	dw Route13AfterBattleText6 ; TextAfterBattle
 	dw Route13EndBattleText6 ; TextEndBattle
 	dw Route13EndBattleText6 ; TextEndBattle
 
-Route13TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_6
+Route13TrainerHeader5:
+	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_5
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_5
 	dw Route13BattleText7 ; TextBeforeBattle
 	dw Route13AfterBattleText7 ; TextAfterBattle
 	dw Route13EndBattleText7 ; TextEndBattle
 	dw Route13EndBattleText7 ; TextEndBattle
 
-Route13TrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_7
+Route13TrainerHeader6:
+	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_6
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_7
+	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_6
 	dw Route13BattleText8 ; TextBeforeBattle
 	dw Route13AfterBattleText8 ; TextAfterBattle
 	dw Route13EndBattleText8 ; TextEndBattle
 	dw Route13EndBattleText8 ; TextEndBattle
 
-Route13TrainerHeader8:
-	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_8, 1
+Route13TrainerHeader7:
+	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_7, 1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_8, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_7, 1
 	dw Route13BattleText9 ; TextBeforeBattle
 	dw Route13AfterBattleText9 ; TextAfterBattle
 	dw Route13EndBattleText9 ; TextEndBattle
 	dw Route13EndBattleText9 ; TextEndBattle
 
-Route13TrainerHeader9:
-	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_9, 1
+Route13TrainerHeader8:
+	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_8, 1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_9, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_8, 1
 	dw Route13BattleText10 ; TextBeforeBattle
 	dw Route13AfterBattleText10 ; TextAfterBattle
 	dw Route13EndBattleText10 ; TextEndBattle
 	dw Route13EndBattleText10 ; TextEndBattle
 
-Route13TrainerHeader10:
-	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_10, 1
+Route13TrainerHeader9:
+	dbEventFlagBit EVENT_BEAT_ROUTE_13_TRAINER_9, 1
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_10, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_13_TRAINER_9, 1
 	dw Route13BattleText11 ; TextBeforeBattle
 	dw Route13AfterBattleText11 ; TextAfterBattle
 	dw Route13EndBattleText11 ; TextEndBattle
@@ -140,7 +139,7 @@ Route13AfterBattleText2:
 
 Route13Text2:
 	TX_ASM
-	ld hl, Route13TrainerHeader2
+	ld hl, Route13TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -158,7 +157,7 @@ Route13AfterBattleText3:
 
 Route13Text3:
 	TX_ASM
-	ld hl, Route13TrainerHeader3
+	ld hl, Route13TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -176,7 +175,7 @@ Route13AfterBattleText4:
 
 Route13Text4:
 	TX_ASM
-	ld hl, Route13TrainerHeader4
+	ld hl, Route13TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -194,7 +193,7 @@ Route13AfterBattleText5:
 
 Route13Text5:
 	TX_ASM
-	ld hl, Route13TrainerHeader5
+	ld hl, Route13TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -212,7 +211,7 @@ Route13AfterBattleText6:
 
 Route13Text6:
 	TX_ASM
-	ld hl, Route13TrainerHeader6
+	ld hl, Route13TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -230,7 +229,7 @@ Route13AfterBattleText7:
 
 Route13Text7:
 	TX_ASM
-	ld hl, Route13TrainerHeader7
+	ld hl, Route13TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -248,7 +247,7 @@ Route13AfterBattleText8:
 
 Route13Text8:
 	TX_ASM
-	ld hl, Route13TrainerHeader8
+	ld hl, Route13TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -266,7 +265,7 @@ Route13AfterBattleText9:
 
 Route13Text9:
 	TX_ASM
-	ld hl, Route13TrainerHeader9
+	ld hl, Route13TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -284,7 +283,7 @@ Route13AfterBattleText10:
 
 Route13Text10:
 	TX_ASM
-	ld hl, Route13TrainerHeader10
+	ld hl, Route13TrainerHeader9
 	call TalkToTrainer
 	jp TextScriptEnd
 
diff --git a/scripts/route14.asm b/scripts/Route14.asm
index 70f747c5..fdc84d74 100755
--- a/scripts/route14.asm
+++ b/scripts/Route14.asm
@@ -1,18 +1,18 @@
-Route14Script:
+Route14_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route14TrainerHeaders
-	ld de, Route14ScriptPointers
+	ld hl, Route14TrainerHeader0
+	ld de, Route14_ScriptPointers
 	ld a, [wRoute14CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute14CurScript], a
 	ret
 
-Route14ScriptPointers:
+Route14_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route14TextPointers:
+Route14_TextPointers:
 	dw Route14Text1
 	dw Route14Text2
 	dw Route14Text3
@@ -25,7 +25,6 @@ Route14TextPointers:
 	dw Route14Text10
 	dw Route14Text11
 
-Route14TrainerHeaders:
 Route14TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_14_TRAINER_0
 	db ($2 << 4) ; trainer's view range
diff --git a/scripts/route15.asm b/scripts/Route15.asm
index e3329ab4..d973eb9c 100755
--- a/scripts/route15.asm
+++ b/scripts/Route15.asm
@@ -1,18 +1,18 @@
-Route15Script:
+Route15_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route15TrainerHeaders
-	ld de, Route15ScriptPointers
+	ld hl, Route15TrainerHeader0
+	ld de, Route15_ScriptPointers
 	ld a, [wRoute15CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute15CurScript], a
 	ret
 
-Route15ScriptPointers:
+Route15_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route15TextPointers:
+Route15_TextPointers:
 	dw Route15Text1
 	dw Route15Text2
 	dw Route15Text3
@@ -26,7 +26,6 @@ Route15TextPointers:
 	dw PickUpItemText
 	dw Route15Text12
 
-Route15TrainerHeaders:
 Route15TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_0
 	db ($2 << 4) ; trainer's view range
diff --git a/scripts/route15gate.asm b/scripts/Route15Gate1F.asm
index 40db02dd..910eb2a5 100755
--- a/scripts/route15gate.asm
+++ b/scripts/Route15Gate1F.asm
@@ -1,7 +1,7 @@
-Route15GateScript:
+Route15Gate1F_Script:
 	jp EnableAutoTextBoxDrawing
 
-Route15GateTextPointers:
+Route15Gate1F_TextPointers:
 	dw Route15GateText1
 
 Route15GateText1:
diff --git a/scripts/route15gateupstairs.asm b/scripts/Route15Gate2F.asm
index c7f6a2ad..83763762 100755
--- a/scripts/route15gateupstairs.asm
+++ b/scripts/Route15Gate2F.asm
@@ -1,7 +1,7 @@
-Route15GateUpstairsScript:
+Route15Gate2F_Script:
 	jp DisableAutoTextBoxDrawing
 
-Route15GateUpstairsTextPointers:
+Route15Gate2F_TextPointers:
 	dw Route15GateUpstairsText1
 	dw Route15GateUpstairsText2
 
diff --git a/scripts/route16.asm b/scripts/Route16.asm
index fe38fac4..54f83380 100755
--- a/scripts/route16.asm
+++ b/scripts/Route16.asm
@@ -1,7 +1,7 @@
-Route16Script:
+Route16_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route16TrainerHeaders
-	ld de, Route16ScriptPointers
+	ld hl, Route16TrainerHeader0
+	ld de, Route16_ScriptPointers
 	ld a, [wRoute16CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute16CurScript], a
@@ -14,7 +14,7 @@ Route16Script_59946:
 	ld [wCurMapScript], a
 	ret
 
-Route16ScriptPointers:
+Route16_ScriptPointers:
 	dw Route16Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -61,7 +61,7 @@ Route16Script3:
 	ld [wCurMapScript], a
 	ret
 
-Route16TextPointers:
+Route16_TextPointers:
 	dw Route16Text1
 	dw Route16Text2
 	dw Route16Text3
@@ -74,7 +74,6 @@ Route16TextPointers:
 	dw Route16Text10
 	dw Route16Text11
 
-Route16TrainerHeaders:
 Route16TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_16_TRAINER_0
 	db ($3 << 4) ; trainer's view range
diff --git a/scripts/route16house.asm b/scripts/Route16FlyHouse.asm
index d8c9d5ed..1d74ac80 100755
--- a/scripts/route16house.asm
+++ b/scripts/Route16FlyHouse.asm
@@ -1,7 +1,7 @@
-Route16HouseScript:
+Route16FlyHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-Route16HouseTextPointers:
+Route16FlyHouse_TextPointers:
 	dw Route16HouseText1
 	dw Route16HouseText2
 
@@ -30,7 +30,8 @@ Route16HouseText3:
 
 ReceivedHM02Text:
 	TX_FAR _ReceivedHM02Text
-	db $11, "@"
+	TX_SFX_KEY_ITEM
+	db "@"
 
 HM02ExplanationText:
 	TX_FAR _HM02ExplanationText
diff --git a/scripts/route16gate.asm b/scripts/Route16Gate1F.asm
index df478b1f..f814d209 100755
--- a/scripts/route16gate.asm
+++ b/scripts/Route16Gate1F.asm
@@ -1,12 +1,12 @@
-Route16GateScript:
+Route16Gate1F_Script:
 	ld hl, wd732
 	res 5, [hl]
 	call EnableAutoTextBoxDrawing
-	ld a, [wRoute16GateCurScript]
-	ld hl, Route16GateScriptPointers
-	jp JumpTable
+	ld a, [wRoute16Gate1FCurScript]
+	ld hl, Route16Gate1F_ScriptPointers
+	jp CallFunctionInTable
 
-Route16GateScriptPointers:
+Route16Gate1F_ScriptPointers:
 	dw Route16GateScript0
 	dw Route16GateScript1
 	dw Route16GateScript2
@@ -36,11 +36,11 @@ Route16GateScript0:
 	call FillMemory
 	call StartSimulatingJoypadStates
 	ld a, $1
-	ld [wRoute16GateCurScript], a
+	ld [wRoute16Gate1FCurScript], a
 	ret
 .asm_4970e
 	ld a, $2
-	ld [wRoute16GateCurScript], a
+	ld [wRoute16Gate1FCurScript], a
 	ret
 
 CoordsData_49714:
@@ -67,7 +67,7 @@ Route16GateScript2:
 	ld [wSimulatedJoypadStatesEnd], a
 	call StartSimulatingJoypadStates
 	ld a, $3
-	ld [wRoute16GateCurScript], a
+	ld [wRoute16Gate1FCurScript], a
 	ret
 
 Route16GateScript3:
@@ -79,14 +79,14 @@ Route16GateScript3:
 	ld hl, wd730
 	res 7, [hl]
 	ld a, $0
-	ld [wRoute16GateCurScript], a
+	ld [wRoute16Gate1FCurScript], a
 	ret
 
 Route16GateScript_49755:
 	ld b, BICYCLE
 	jp IsItemInBag
 
-Route16GateTextPointers:
+Route16Gate1F_TextPointers:
 	dw Route16GateText1
 	dw Route16GateText2
 	dw Route16GateText3
diff --git a/scripts/route16gateupstairs.asm b/scripts/Route16Gate2F.asm
index 664976a2..643a5ec7 100755
--- a/scripts/route16gateupstairs.asm
+++ b/scripts/Route16Gate2F.asm
@@ -1,7 +1,7 @@
-Route16GateUpstairsScript:
+Route16Gate2F_Script:
 	jp DisableAutoTextBoxDrawing
 
-Route16GateUpstairsTextPointers:
+Route16Gate2F_TextPointers:
 	dw Route16GateUpstairsText1
 	dw Route16GateUpstairsText2
 	dw Route16GateUpstairsText3
diff --git a/scripts/route17.asm b/scripts/Route17.asm
index ddf92c2d..dd92ac44 100755
--- a/scripts/route17.asm
+++ b/scripts/Route17.asm
@@ -1,18 +1,18 @@
-Route17Script:
+Route17_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route17TrainerHeaders
-	ld de, Route17ScriptPointers
+	ld hl, Route17TrainerHeader0
+	ld de, Route17_ScriptPointers
 	ld a, [wRoute17CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute17CurScript], a
 	ret
 
-Route17ScriptPointers:
+Route17_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route17TextPointers:
+Route17_TextPointers:
 	dw Route17Text1
 	dw Route17Text2
 	dw Route17Text3
@@ -30,7 +30,6 @@ Route17TextPointers:
 	dw Route17Text15
 	dw Route17Text16
 
-Route17TrainerHeaders:
 Route17TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_0
 	db ($3 << 4) ; trainer's view range
diff --git a/scripts/route18.asm b/scripts/Route18.asm
index b89e2613..022d41be 100755
--- a/scripts/route18.asm
+++ b/scripts/Route18.asm
@@ -1,25 +1,24 @@
-Route18Script:
+Route18_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route18TrainerHeaders
-	ld de, Route18ScriptPointers
+	ld hl, Route18TrainerHeader0
+	ld de, Route18_ScriptPointers
 	ld a, [wRoute18CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute18CurScript], a
 	ret
 
-Route18ScriptPointers:
+Route18_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route18TextPointers:
+Route18_TextPointers:
 	dw Route18Text1
 	dw Route18Text2
 	dw Route18Text3
 	dw Route18Text4
 	dw Route18Text5
 
-Route18TrainerHeaders:
 Route18TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_0
 	db ($3 << 4) ; trainer's view range
diff --git a/scripts/route18gate.asm b/scripts/Route18Gate1F.asm
index 186ea61b..812cb3e0 100755
--- a/scripts/route18gate.asm
+++ b/scripts/Route18Gate1F.asm
@@ -1,12 +1,12 @@
-Route18GateScript:
+Route18Gate1F_Script:
 	ld hl, wd732
 	res 5, [hl]
 	call EnableAutoTextBoxDrawing
-	ld a, [wRoute18GateCurScript]
-	ld hl, Route18GateScriptPointers
-	jp JumpTable
+	ld a, [wRoute18Gate1FCurScript]
+	ld hl, Route18Gate1F_ScriptPointers
+	jp CallFunctionInTable
 
-Route18GateScriptPointers:
+Route18Gate1F_ScriptPointers:
 	dw Route18GateScript0
 	dw Route18GateScript1
 	dw Route18GateScript2
@@ -36,11 +36,11 @@ Route18GateScript0:
 	call FillMemory
 	call StartSimulatingJoypadStates
 	ld a, $1
-	ld [wRoute18GateCurScript], a
+	ld [wRoute18Gate1FCurScript], a
 	ret
 .asm_498c6
 	ld a, $2
-	ld [wRoute18GateCurScript], a
+	ld [wRoute18Gate1FCurScript], a
 	ret
 
 CoordsData_498cc:
@@ -67,7 +67,7 @@ Route18GateScript2:
 	ld [wSimulatedJoypadStatesEnd], a
 	call StartSimulatingJoypadStates
 	ld a, $3
-	ld [wRoute18GateCurScript], a
+	ld [wRoute18Gate1FCurScript], a
 	ret
 
 Route18GateScript3:
@@ -79,10 +79,10 @@ Route18GateScript3:
 	ld hl, wd730
 	res 7, [hl]
 	ld a, $0
-	ld [wRoute18GateCurScript], a
+	ld [wRoute18Gate1FCurScript], a
 	ret
 
-Route18GateTextPointers:
+Route18Gate1F_TextPointers:
 	dw Route18GateText1
 	dw Route18GateText2
 
diff --git a/scripts/route18gateupstairs.asm b/scripts/Route18Gate2F.asm
index 3d623142..6987a099 100755
--- a/scripts/route18gateupstairs.asm
+++ b/scripts/Route18Gate2F.asm
@@ -1,7 +1,7 @@
-Route18GateUpstairsScript:
+Route18Gate2F_Script:
 	jp DisableAutoTextBoxDrawing
 
-Route18GateUpstairsTextPointers:
+Route18Gate2F_TextPointers:
 	dw Route18GateUpstairsText1
 	dw Route18GateUpstairsText2
 	dw Route18GateUpstairsText3
diff --git a/scripts/route19.asm b/scripts/Route19.asm
index 162c4548..febeb9a4 100755
--- a/scripts/route19.asm
+++ b/scripts/Route19.asm
@@ -1,18 +1,18 @@
-Route19Script:
+Route19_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route19TrainerHeaders
-	ld de, Route19ScriptPointers
+	ld hl, Route19TrainerHeader0
+	ld de, Route19_ScriptPointers
 	ld a, [wRoute19CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute19CurScript], a
 	ret
 
-Route19ScriptPointers:
+Route19_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route19TextPointers:
+Route19_TextPointers:
 	dw Route19Text1
 	dw Route19Text2
 	dw Route19Text3
@@ -25,7 +25,6 @@ Route19TextPointers:
 	dw Route19Text10
 	dw Route19Text11
 
-Route19TrainerHeaders:
 Route19TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_0
 	db ($4 << 4) ; trainer's view range
diff --git a/scripts/route1_2.asm b/scripts/Route1_2.asm
index 6e9b472e..ee34ce55 100755
--- a/scripts/route1_2.asm
+++ b/scripts/Route1_2.asm
@@ -23,7 +23,7 @@ Route1ViridianMartSampleText:
 
 Route1Text_f1aff:
 	TX_FAR _Route1Text_1cae8
-	TX_SFX_ITEM
+	TX_SFX_ITEM_1
 	db "@"
 
 Route1Text_f1b05:
diff --git a/scripts/route2.asm b/scripts/Route2.asm
index 810792ef..f4b1c8c4 100755
--- a/scripts/route2.asm
+++ b/scripts/Route2.asm
@@ -1,7 +1,7 @@
-Route2Script:
+Route2_Script:
 	jp EnableAutoTextBoxDrawing
 
-Route2TextPointers:
+Route2_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 	dw Route2Text3
diff --git a/scripts/route20.asm b/scripts/Route20.asm
index 012c9c53..081a723e 100755
--- a/scripts/route20.asm
+++ b/scripts/Route20.asm
@@ -1,9 +1,9 @@
-Route20Script:
+Route20_Script:
 	CheckAndResetEvent EVENT_IN_SEAFOAM_ISLANDS
 	call nz, Route20Script_50cc6
 	call EnableAutoTextBoxDrawing
 	ld hl, Route20TrainerHeader0
-	ld de, Route20ScriptPointers
+	ld de, Route20_ScriptPointers
 	ld a, [wRoute20CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute20CurScript], a
@@ -12,9 +12,9 @@ Route20Script:
 Route20Script_50cc6:
 	CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE
 	jr z, .asm_50cef
-	ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_1
 	call Route20Script_50d0c
-	ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_2
 	call Route20Script_50d0c
 	ld hl, .MissableObjectIDs
 .asm_50cdc
@@ -27,24 +27,24 @@ Route20Script_50cc6:
 	jr .asm_50cdc
 
 .MissableObjectIDs:
-	db HS_SEAFOAM_ISLANDS_2_BOULDER_1
-	db HS_SEAFOAM_ISLANDS_2_BOULDER_2
-	db HS_SEAFOAM_ISLANDS_3_BOULDER_1
-	db HS_SEAFOAM_ISLANDS_3_BOULDER_2
-	db HS_SEAFOAM_ISLANDS_4_BOULDER_3
-	db HS_SEAFOAM_ISLANDS_4_BOULDER_4
+	db HS_SEAFOAM_ISLANDS_B1F_BOULDER_1
+	db HS_SEAFOAM_ISLANDS_B1F_BOULDER_2
+	db HS_SEAFOAM_ISLANDS_B2F_BOULDER_1
+	db HS_SEAFOAM_ISLANDS_B2F_BOULDER_2
+	db HS_SEAFOAM_ISLANDS_B3F_BOULDER_3
+	db HS_SEAFOAM_ISLANDS_B3F_BOULDER_4
 	db $FF
 
 .asm_50cef
 	CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE
 	ret z
-	ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_1
 	call Route20Script_50d0c
-	ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_2
 	call Route20Script_50d0c
-	ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_1
 	call Route20Script_50d14
-	ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_2
 	call Route20Script_50d14
 	ret
 
@@ -56,12 +56,12 @@ Route20Script_50d14:
 	ld [wMissableObjectIndex], a
 	predef_jump HideObject
 
-Route20ScriptPointers:
+Route20_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route20TextPointers:
+Route20_TextPointers:
 	dw Route20Text1
 	dw Route20Text2
 	dw Route20Text3
@@ -75,7 +75,6 @@ Route20TextPointers:
 	dw Route20Text11
 	dw Route20Text12
 
-Route20TrainerHeaders:
 Route20TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_0
 	db ($4 << 4) ; trainer's view range
@@ -85,82 +84,82 @@ Route20TrainerHeader0:
 	dw Route20EndBattleText1 ; TextEndBattle
 	dw Route20EndBattleText1 ; TextEndBattle
 
-Route20TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_2
+Route20TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_1
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_1
 	dw Route20BattleText2 ; TextBeforeBattle
 	dw Route20AfterBattleText2 ; TextAfterBattle
 	dw Route20EndBattleText2 ; TextEndBattle
 	dw Route20EndBattleText2 ; TextEndBattle
 
-Route20TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_3
+Route20TrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_2
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_2
 	dw Route20BattleText3 ; TextBeforeBattle
 	dw Route20AfterBattleText3 ; TextAfterBattle
 	dw Route20EndBattleText3 ; TextEndBattle
 	dw Route20EndBattleText3 ; TextEndBattle
 
-Route20TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_4
+Route20TrainerHeader3:
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_3
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_3
 	dw Route20BattleText4 ; TextBeforeBattle
 	dw Route20AfterBattleText4 ; TextAfterBattle
 	dw Route20EndBattleText4 ; TextEndBattle
 	dw Route20EndBattleText4 ; TextEndBattle
 
-Route20TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_5
+Route20TrainerHeader4:
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_4
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_4
 	dw Route20BattleText5 ; TextBeforeBattle
 	dw Route20AfterBattleText5 ; TextAfterBattle
 	dw Route20EndBattleText5 ; TextEndBattle
 	dw Route20EndBattleText5 ; TextEndBattle
 
-Route20TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_6
+Route20TrainerHeader5:
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_5
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_5
 	dw Route20BattleText6 ; TextBeforeBattle
 	dw Route20AfterBattleText6 ; TextAfterBattle
 	dw Route20EndBattleText6 ; TextEndBattle
 	dw Route20EndBattleText6 ; TextEndBattle
 
-Route20TrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_7
+Route20TrainerHeader6:
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_6
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_7
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_6
 	dw Route20BattleText7 ; TextBeforeBattle
 	dw Route20AfterBattleText7 ; TextAfterBattle
 	dw Route20EndBattleText7 ; TextEndBattle
 	dw Route20EndBattleText7 ; TextEndBattle
 
-Route20TrainerHeader8:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_8, 1
+Route20TrainerHeader7:
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_7, 1
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_8, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_7, 1
 	dw Route20BattleText8 ; TextBeforeBattle
 	dw Route20AfterBattleText8 ; TextAfterBattle
 	dw Route20EndBattleText8 ; TextEndBattle
 	dw Route20EndBattleText8 ; TextEndBattle
 
-Route20TrainerHeader9:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_9, 1
+Route20TrainerHeader8:
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_8, 1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_9, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_8, 1
 	dw Route20BattleText9 ; TextBeforeBattle
 	dw Route20AfterBattleText9 ; TextAfterBattle
 	dw Route20EndBattleText9 ; TextEndBattle
 	dw Route20EndBattleText9 ; TextEndBattle
 
-Route20TrainerHeader10:
-	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_10, 1
+Route20TrainerHeader9:
+	dbEventFlagBit EVENT_BEAT_ROUTE_20_TRAINER_9, 1
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_10, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_20_TRAINER_9, 1
 	dw Route20BattleText10 ; TextBeforeBattle
 	dw Route20AfterBattleText10 ; TextAfterBattle
 	dw Route20EndBattleText10 ; TextEndBattle
@@ -176,55 +175,55 @@ Route20Text1:
 
 Route20Text2:
 	TX_ASM
-	ld hl, Route20TrainerHeader2
+	ld hl, Route20TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text3:
 	TX_ASM
-	ld hl, Route20TrainerHeader3
+	ld hl, Route20TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text4:
 	TX_ASM
-	ld hl, Route20TrainerHeader4
+	ld hl, Route20TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text5:
 	TX_ASM
-	ld hl, Route20TrainerHeader5
+	ld hl, Route20TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text6:
 	TX_ASM
-	ld hl, Route20TrainerHeader6
+	ld hl, Route20TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text7:
 	TX_ASM
-	ld hl, Route20TrainerHeader7
+	ld hl, Route20TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text8:
 	TX_ASM
-	ld hl, Route20TrainerHeader8
+	ld hl, Route20TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text9:
 	TX_ASM
-	ld hl, Route20TrainerHeader9
+	ld hl, Route20TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route20Text10:
 	TX_ASM
-	ld hl, Route20TrainerHeader10
+	ld hl, Route20TrainerHeader9
 	call TalkToTrainer
 	jp TextScriptEnd
 
diff --git a/scripts/route21.asm b/scripts/Route21.asm
index 89874e58..15dacd5d 100755
--- a/scripts/route21.asm
+++ b/scripts/Route21.asm
@@ -1,18 +1,18 @@
-Route21Script:
+Route21_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route21TrainerHeaders
-	ld de, Route21ScriptPointers
+	ld hl, Route21TrainerHeader0
+	ld de, Route21_ScriptPointers
 	ld a, [wRoute21CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute21CurScript], a
 	ret
 
-Route21ScriptPointers:
+Route21_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route21TextPointers:
+Route21_TextPointers:
 	dw Route21Text1
 	dw Route21Text2
 	dw Route21Text3
@@ -23,7 +23,6 @@ Route21TextPointers:
 	dw Route21Text8
 	dw Route21Text9
 
-Route21TrainerHeaders:
 Route21TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_0
 	db ($0 << 4) ; trainer's view range
diff --git a/scripts/route22.asm b/scripts/Route22.asm
index 41f77680..ff57f902 100755
--- a/scripts/route22.asm
+++ b/scripts/Route22.asm
@@ -1,10 +1,10 @@
-Route22Script:
+Route22_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route22ScriptPointers
+	ld hl, Route22_ScriptPointers
 	ld a, [wRoute22CurScript]
-	jp JumpTable
+	jp CallFunctionInTable
 
-Route22ScriptPointers:
+Route22_ScriptPointers:
 	dw Route22Script0
 	dw Route22Script1
 	dw Route22Script2
@@ -373,7 +373,7 @@ Route22Script6:
 	ld [wRoute22CurScript], a
 	ret
 
-Route22TextPointers:
+Route22_TextPointers:
 	dw Route22Text1
 	dw Route22Text2
 	dw Route22FrontGateText
diff --git a/scripts/route22gate.asm b/scripts/Route22Gate.asm
index 2b622a43..946366b5 100755
--- a/scripts/route22gate.asm
+++ b/scripts/Route22Gate.asm
@@ -1,8 +1,8 @@
-Route22GateScript:
+Route22Gate_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route22GateScriptPointers
+	ld hl, Route22Gate_ScriptPointers
 	ld a, [wRoute22GateCurScript]
-	call JumpTable
+	call CallFunctionInTable
 	ld a, [wYCoord]
 	cp $4
 	ld a, ROUTE_23
@@ -12,7 +12,7 @@ Route22GateScript:
 	ld [wLastMap], a
 	ret
 
-Route22GateScriptPointers:
+Route22Gate_ScriptPointers:
 	dw Route22GateScript0
 	dw Route22GateScript1
 	dw Route22GateScript2
@@ -56,7 +56,7 @@ Route22GateScript1:
 Route22GateScript2:
 	ret
 
-Route22GateTextPointers:
+Route22Gate_TextPointers:
 	dw Route22GateText1
 
 Route22GateText1:
@@ -92,5 +92,5 @@ Route22GateText_1e715:
 
 Route22GateText_1e71a:
 	TX_FAR _Route22GateText_1e71a
-	TX_SFX_ITEM
+	TX_SFX_ITEM_1
 	db "@"
diff --git a/scripts/route22_2.asm b/scripts/Route22_2.asm
index 1cd23ed2..1cd23ed2 100755
--- a/scripts/route22_2.asm
+++ b/scripts/Route22_2.asm
diff --git a/scripts/route23.asm b/scripts/Route23.asm
index c2863f89..34d95b84 100755
--- a/scripts/route23.asm
+++ b/scripts/Route23.asm
@@ -1,9 +1,9 @@
-Route23Script:
+Route23_Script:
 	call Route23Script_511e9
 	call EnableAutoTextBoxDrawing
-	ld hl, Route23ScriptPointers
+	ld hl, Route23_ScriptPointers
 	ld a, [wRoute23CurScript]
-	jp JumpTable
+	jp CallFunctionInTable
 
 Route23Script_511e9:
 	ld hl, wCurrentMapScriptFlags
@@ -12,14 +12,14 @@ Route23Script_511e9:
 	ret z
 	ResetEvents EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1, EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2
 	ResetEvents EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1, EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2
-	ld a, HS_VICTORY_ROAD_3_BOULDER
+	ld a, HS_VICTORY_ROAD_3F_BOULDER
 	ld [wMissableObjectIndex], a
 	predef ShowObject
-	ld a, HS_VICTORY_ROAD_2_BOULDER
+	ld a, HS_VICTORY_ROAD_2F_BOULDER
 	ld [wMissableObjectIndex], a
 	predef_jump HideObject
 
-Route23ScriptPointers:
+Route23_ScriptPointers:
 	dw Route23Script0
 	dw Route23Script1
 	dw Route23Script2
@@ -131,7 +131,7 @@ Route23Script2:
 	ld [wRoute23CurScript], a
 	ret
 
-Route23TextPointers:
+Route23_TextPointers:
 	dw Route23Text1
 	dw Route23Text2
 	dw Route23Text3
@@ -227,7 +227,7 @@ VictoryRoadGuardText1:
 
 VictoryRoadGuardText2:
 	TX_FAR _VictoryRoadGuardText2
-	db $b
+	TX_SFX_ITEM_1
 	TX_FAR _VictoryRoadGuardText_513a3
 	db "@"
 
diff --git a/scripts/route24.asm b/scripts/Route24.asm
index d2872ccc..58f71981 100755
--- a/scripts/route24.asm
+++ b/scripts/Route24.asm
@@ -1,7 +1,7 @@
-Route24Script:
+Route24_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route24TrainerHeaders
-	ld de, Route24ScriptPointers
+	ld hl, Route24TrainerHeader0
+	ld de, Route24_ScriptPointers
 	ld a, [wRoute24CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute24CurScript], a
@@ -14,7 +14,7 @@ Route24Script_513c0:
 	ld [wCurMapScript], a
 	ret
 
-Route24ScriptPointers:
+Route24_ScriptPointers:
 	dw Route24Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -75,7 +75,7 @@ Route24Script3:
 	ld [wCurMapScript], a
 	ret
 
-Route24TextPointers:
+Route24_TextPointers:
 	dw Route24Text1
 	dw Route24Text2
 	dw Route24Text3
@@ -86,7 +86,6 @@ Route24TextPointers:
 	dw PickUpItemText
 	dw Route24Text8
 
-Route24TrainerHeaders:
 Route24TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_0
 	db ($4 << 4) ; trainer's view range
@@ -96,46 +95,46 @@ Route24TrainerHeader0:
 	dw Route24EndBattleText1 ; TextEndBattle
 	dw Route24EndBattleText1 ; TextEndBattle
 
-Route24TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_2
+Route24TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_1
 	db ($1 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_1
 	dw Route24BattleText2 ; TextBeforeBattle
 	dw Route24AfterBattleText2 ; TextAfterBattle
 	dw Route24EndBattleText2 ; TextEndBattle
 	dw Route24EndBattleText2 ; TextEndBattle
 
-Route24TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_3
+Route24TrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_2
 	db ($1 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_2
 	dw Route24BattleText3 ; TextBeforeBattle
 	dw Route24AfterBattleText3 ; TextAfterBattle
 	dw Route24EndBattleText3 ; TextEndBattle
 	dw Route24EndBattleText3 ; TextEndBattle
 
-Route24TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_4
+Route24TrainerHeader3:
+	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_3
 	db ($1 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_3
 	dw Route24BattleText4 ; TextBeforeBattle
 	dw Route24AfterBattleText4 ; TextAfterBattle
 	dw Route24EndBattleText4 ; TextEndBattle
 	dw Route24EndBattleText4 ; TextEndBattle
 
-Route24TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_5
+Route24TrainerHeader4:
+	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_4
 	db ($1 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_4
 	dw Route24BattleText5 ; TextBeforeBattle
 	dw Route24AfterBattleText5 ; TextAfterBattle
 	dw Route24EndBattleText5 ; TextEndBattle
 	dw Route24EndBattleText5 ; TextEndBattle
 
-Route24TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_6
+Route24TrainerHeader5:
+	dbEventFlagBit EVENT_BEAT_ROUTE_24_TRAINER_5
 	db ($1 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_ROUTE_24_TRAINER_5
 	dw Route24BattleText6 ; TextBeforeBattle
 	dw Route24AfterBattleText6 ; TextAfterBattle
 	dw Route24EndBattleText6 ; TextEndBattle
@@ -186,14 +185,14 @@ Route24Text1:
 
 Route24Text_51510:
 	TX_FAR _Route24Text_51510
-	db $0B
+	TX_SFX_ITEM_1
 	TX_FAR _Route24Text_51515
 	db "@"
 
 Route24Text_5151a:
 	TX_FAR _Route24Text_5151a
 	TX_SFX_KEY_ITEM
-	TX_BUTTON_SOUND
+	TX_BLINK
 	db "@"
 
 Route24Text_51521:
@@ -220,31 +219,31 @@ Route24Text2:
 
 Route24Text3:
 	TX_ASM
-	ld hl, Route24TrainerHeader2
+	ld hl, Route24TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route24Text4:
 	TX_ASM
-	ld hl, Route24TrainerHeader3
+	ld hl, Route24TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route24Text5:
 	TX_ASM
-	ld hl, Route24TrainerHeader4
+	ld hl, Route24TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route24Text6:
 	TX_ASM
-	ld hl, Route24TrainerHeader5
+	ld hl, Route24TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route24Text7:
 	TX_ASM
-	ld hl, Route24TrainerHeader6
+	ld hl, Route24TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
diff --git a/scripts/route25.asm b/scripts/Route25.asm
index cc2e1d9d..c3c11ed5 100755
--- a/scripts/route25.asm
+++ b/scripts/Route25.asm
@@ -1,7 +1,7 @@
-Route25Script:
+Route25_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route25TrainerHeaders
-	ld de, Route25ScriptPointers
+	ld hl, Route25TrainerHeader0
+	ld de, Route25_ScriptPointers
 	ld a, [wRoute25CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute25CurScript], a
@@ -46,12 +46,12 @@ Route25Script_515e1:
 .asm_5165c
 	ret
 
-Route25ScriptPointers:
+Route25_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route25TextPointers:
+Route25_TextPointers:
 	dw Route25Text1
 	dw Route25Text2
 	dw Route25Text3
@@ -64,7 +64,6 @@ Route25TextPointers:
 	dw PickUpItemText
 	dw Route25Text11
 
-Route25TrainerHeaders:
 Route25TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_0
 	db ($2 << 4) ; trainer's view range
@@ -74,73 +73,73 @@ Route25TrainerHeader0:
 	dw Route25EndBattleText1 ; TextEndBattle
 	dw Route25EndBattleText1 ; TextEndBattle
 
-Route25TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_2
+Route25TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_1
 	dw Route25BattleText2 ; TextBeforeBattle
 	dw Route25AfterBattleText2 ; TextAfterBattle
 	dw Route25EndBattleText2 ; TextEndBattle
 	dw Route25EndBattleText2 ; TextEndBattle
 
-Route25TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_3
+Route25TrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_2
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_2
 	dw Route25BattleText3 ; TextBeforeBattle
 	dw Route25AfterBattleText3 ; TextAfterBattle
 	dw Route25EndBattleText3 ; TextEndBattle
 	dw Route25EndBattleText3 ; TextEndBattle
 
-Route25TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_4
+Route25TrainerHeader3:
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_3
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_3
 	dw Route25BattleText4 ; TextBeforeBattle
 	dw Route25AfterBattleText4 ; TextAfterBattle
 	dw Route25EndBattleText4 ; TextEndBattle
 	dw Route25EndBattleText4 ; TextEndBattle
 
-Route25TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_5
+Route25TrainerHeader4:
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_4
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_4
 	dw Route25BattleText5 ; TextBeforeBattle
 	dw Route25AfterBattleText5 ; TextAfterBattle
 	dw Route25EndBattleText5 ; TextEndBattle
 	dw Route25EndBattleText5 ; TextEndBattle
 
-Route25TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_6
+Route25TrainerHeader5:
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_5
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_5
 	dw Route25BattleText6 ; TextBeforeBattle
 	dw Route25AfterBattleText6 ; TextAfterBattle
 	dw Route25EndBattleText6 ; TextEndBattle
 	dw Route25EndBattleText6 ; TextEndBattle
 
-Route25TrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_7
+Route25TrainerHeader6:
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_6
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_7
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_6
 	dw Route25BattleText7 ; TextBeforeBattle
 	dw Route25AfterBattleText7 ; TextAfterBattle
 	dw Route25EndBattleText7 ; TextEndBattle
 	dw Route25EndBattleText7 ; TextEndBattle
 
-Route25TrainerHeader8:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_8, 1
+Route25TrainerHeader7:
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_7, 1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_8, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_7, 1
 	dw Route25BattleText8 ; TextBeforeBattle
 	dw Route25AfterBattleText8 ; TextAfterBattle
 	dw Route25EndBattleText8 ; TextEndBattle
 	dw Route25EndBattleText8 ; TextEndBattle
 
-Route25TrainerHeader9:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_9, 1
+Route25TrainerHeader8:
+	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_8, 1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_9, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_8, 1
 	dw Route25BattleText9 ; TextBeforeBattle
 	dw Route25AfterBattleText9 ; TextAfterBattle
 	dw Route25EndBattleText9 ; TextEndBattle
@@ -156,49 +155,49 @@ Route25Text1:
 
 Route25Text2:
 	TX_ASM
-	ld hl, Route25TrainerHeader2
+	ld hl, Route25TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text3:
 	TX_ASM
-	ld hl, Route25TrainerHeader3
+	ld hl, Route25TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text4:
 	TX_ASM
-	ld hl, Route25TrainerHeader4
+	ld hl, Route25TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text5:
 	TX_ASM
-	ld hl, Route25TrainerHeader5
+	ld hl, Route25TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text6:
 	TX_ASM
-	ld hl, Route25TrainerHeader6
+	ld hl, Route25TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text7:
 	TX_ASM
-	ld hl, Route25TrainerHeader7
+	ld hl, Route25TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text8:
 	TX_ASM
-	ld hl, Route25TrainerHeader8
+	ld hl, Route25TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text9:
 	TX_ASM
-	ld hl, Route25TrainerHeader9
+	ld hl, Route25TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 
diff --git a/scripts/route2gate.asm b/scripts/Route2Gate.asm
index 34f1aa35..70d93814 100755
--- a/scripts/route2gate.asm
+++ b/scripts/Route2Gate.asm
@@ -1,7 +1,7 @@
-Route2GateScript:
+Route2Gate_Script:
 	jp EnableAutoTextBoxDrawing
 
-Route2GateTextPointers:
+Route2Gate_TextPointers:
 	dw Route2GateText1
 	dw Route2GateText2
 
diff --git a/scripts/route2house.asm b/scripts/Route2TradeHouse.asm
index 95055aec..a89e2fe9 100755
--- a/scripts/route2house.asm
+++ b/scripts/Route2TradeHouse.asm
@@ -1,7 +1,7 @@
-Route2HouseScript:
+Route2TradeHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-Route2HouseTextPointers:
+Route2TradeHouse_TextPointers:
 	dw Route2HouseText1
 	dw Route2HouseText2
 
diff --git a/scripts/route3.asm b/scripts/Route3.asm
index b2c5de3e..d55831bf 100755
--- a/scripts/route3.asm
+++ b/scripts/Route3.asm
@@ -1,18 +1,18 @@
-Route3Script:
+Route3_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route3TrainerHeader0
-	ld de, Route3ScriptPointers
+	ld de, Route3_ScriptPointers
 	ld a, [wRoute3CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute3CurScript], a
 	ret
 
-Route3ScriptPointers:
+Route3_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route3TextPointers:
+Route3_TextPointers:
 	dw Route3Text1
 	dw Route3Text2
 	dw Route3Text3
@@ -24,7 +24,6 @@ Route3TextPointers:
 	dw Route3Text9
 	dw Route3Text10
 
-Route3TrainerHeaders:
 Route3TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_0
 	db ($2 << 4) ; trainer's view range
@@ -34,64 +33,64 @@ Route3TrainerHeader0:
 	dw Route3EndBattleText1 ; TextEndBattle
 	dw Route3EndBattleText1 ; TextEndBattle
 
-Route3TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_2
+Route3TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_1
 	dw Route3BattleText2 ; TextBeforeBattle
 	dw Route3AfterBattleText2 ; TextAfterBattle
 	dw Route3EndBattleText2 ; TextEndBattle
 	dw Route3EndBattleText2 ; TextEndBattle
 
-Route3TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_3
+Route3TrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_2
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_2
 	dw Route3BattleText3 ; TextBeforeBattle
 	dw Route3AfterBattleText3 ; TextAfterBattle
 	dw Route3EndBattleText3 ; TextEndBattle
 	dw Route3EndBattleText3 ; TextEndBattle
 
-Route3TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_4
+Route3TrainerHeader3:
+	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_3
 	db ($1 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_3
 	dw Route3BattleText4 ; TextBeforeBattle
 	dw Route3AfterBattleText4 ; TextAfterBattle
 	dw Route3EndBattleText4 ; TextEndBattle
 	dw Route3EndBattleText4 ; TextEndBattle
 
-Route3TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_5
+Route3TrainerHeader4:
+	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_4
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_4
 	dw Route3BattleText5 ; TextBeforeBattle
 	dw Route3AfterBattleText5 ; TextAfterBattle
 	dw Route3EndBattleText5 ; TextEndBattle
 	dw Route3EndBattleText5 ; TextEndBattle
 
-Route3TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_6
+Route3TrainerHeader5:
+	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_5
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_5
 	dw Route3BattleText6 ; TextBeforeBattle
 	dw Route3AfterBattleText6 ; TextAfterBattle
 	dw Route3EndBattleText6 ; TextEndBattle
 	dw Route3EndBattleText6 ; TextEndBattle
 
-Route3TrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_7, 1
+Route3TrainerHeader6:
+	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_6, 1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_7, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_6, 1
 	dw Route3BattleText7 ; TextBeforeBattle
 	dw Route3AfterBattleText7 ; TextAfterBattle
 	dw Route3EndBattleText7 ; TextEndBattle
 	dw Route3EndBattleText7 ; TextEndBattle
 
-Route3TrainerHeader8:
-	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_8, 1
+Route3TrainerHeader7:
+	dbEventFlagBit EVENT_BEAT_ROUTE_3_TRAINER_7, 1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_8, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_3_TRAINER_7, 1
 	dw Route3BattleText8 ; TextBeforeBattle
 	dw Route3AfterBattleText8 ; TextAfterBattle
 	dw Route3EndBattleText8 ; TextEndBattle
@@ -123,7 +122,7 @@ Route3AfterBattleText1:
 
 Route3Text3:
 	TX_ASM
-	ld hl, Route3TrainerHeader2
+	ld hl, Route3TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -141,7 +140,7 @@ Route3AfterBattleText2:
 
 Route3Text4:
 	TX_ASM
-	ld hl, Route3TrainerHeader3
+	ld hl, Route3TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -159,7 +158,7 @@ Route3AfterBattleText3:
 
 Route3Text5:
 	TX_ASM
-	ld hl, Route3TrainerHeader4
+	ld hl, Route3TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -177,7 +176,7 @@ Route3AfterBattleText4:
 
 Route3Text6:
 	TX_ASM
-	ld hl, Route3TrainerHeader5
+	ld hl, Route3TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -195,7 +194,7 @@ Route3AfterBattleText5:
 
 Route3Text7:
 	TX_ASM
-	ld hl, Route3TrainerHeader6
+	ld hl, Route3TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -213,7 +212,7 @@ Route3AfterBattleText6:
 
 Route3Text8:
 	TX_ASM
-	ld hl, Route3TrainerHeader7
+	ld hl, Route3TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -231,7 +230,7 @@ Route3AfterBattleText7:
 
 Route3Text9:
 	TX_ASM
-	ld hl, Route3TrainerHeader8
+	ld hl, Route3TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
diff --git a/scripts/route4.asm b/scripts/Route4.asm
index 559f2006..9b04a47a 100755
--- a/scripts/route4.asm
+++ b/scripts/Route4.asm
@@ -1,18 +1,18 @@
-Route4Script:
+Route4_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route4TrainerHeaders
-	ld de, Route4ScriptPointers
+	ld hl, Route4TrainerHeader0
+	ld de, Route4_ScriptPointers
 	ld a, [wRoute4CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute4CurScript], a
 	ret
 
-Route4ScriptPointers:
+Route4_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route4TextPointers:
+Route4_TextPointers:
 	dw Route4Text1
 	dw Route4Text2
 	dw PickUpItemText
@@ -20,7 +20,6 @@ Route4TextPointers:
 	dw Route4Text5
 	dw Route4Text6
 
-Route4TrainerHeaders:
 Route4TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_4_TRAINER_0
 	db ($3 << 4) ; trainer's view range
diff --git a/scripts/route5.asm b/scripts/Route5.asm
index 113212a4..1b2bd242 100755
--- a/scripts/route5.asm
+++ b/scripts/Route5.asm
@@ -1,7 +1,7 @@
-Route5Script:
+Route5_Script:
 	jp EnableAutoTextBoxDrawing
 
-Route5TextPointers:
+Route5_TextPointers:
 	dw Route5Text1
 
 Route5Text1:
diff --git a/scripts/route5gate.asm b/scripts/Route5Gate.asm
index b3ad0aa3..bc763dfd 100755
--- a/scripts/route5gate.asm
+++ b/scripts/Route5Gate.asm
@@ -1,10 +1,10 @@
-Route5GateScript:
+Route5Gate_Script:
 	call EnableAutoTextBoxDrawing
 	ld a, [wRoute5GateCurScript]
-	ld hl, Route5GateScriptPointers
-	jp JumpTable
+	ld hl, Route5Gate_ScriptPointers
+	jp CallFunctionInTable
 
-Route5GateScriptPointers:
+Route5Gate_ScriptPointers:
 	dw Route5GateScript0
 	dw Route5GateScript1
 
@@ -60,7 +60,7 @@ Route5GateScript1:
 	ld [wRoute5GateCurScript], a
 	ret
 
-Route5GateTextPointers:
+Route5Gate_TextPointers:
 	dw Route5GateText1
 	dw Route5GateText2
 	dw Route5GateText3
@@ -106,7 +106,7 @@ Route7GateText3:
 Route6GateText3:
 Route5GateText3:
 	TX_FAR _SaffronGateText_8aaa9
-	db $11
+	TX_SFX_KEY_ITEM
 	TX_FAR _SaffronGateText_1dff1
 	db "@"
 
diff --git a/scripts/route6.asm b/scripts/Route6.asm
index 7f3a5dda..6ee3f317 100755
--- a/scripts/route6.asm
+++ b/scripts/Route6.asm
@@ -1,18 +1,18 @@
-Route6Script:
+Route6_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route6TrainerHeaders
-	ld de, Route6ScriptPointers
+	ld hl, Route6TrainerHeader0
+	ld de, Route6_ScriptPointers
 	ld a, [wRoute6CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute6CurScript], a
 	ret
 
-Route6ScriptPointers:
+Route6_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route6TextPointers:
+Route6_TextPointers:
 	dw Route6Text1
 	dw Route6Text2
 	dw Route6Text3
@@ -21,7 +21,6 @@ Route6TextPointers:
 	dw Route6Text6
 	dw Route6Text7
 
-Route6TrainerHeaders:
 Route6TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_6_TRAINER_0
 	db ($0 << 4) ; trainer's view range
diff --git a/scripts/route6gate.asm b/scripts/Route6Gate.asm
index 001a295c..348f61ac 100755
--- a/scripts/route6gate.asm
+++ b/scripts/Route6Gate.asm
@@ -1,11 +1,11 @@
-Route6GateScript:
+Route6Gate_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route6GateScriptPointers
+	ld hl, Route6Gate_ScriptPointers
 	ld a, [wRoute6GateCurScript]
-	call JumpTable
+	call CallFunctionInTable
 	ret
 
-Route6GateScriptPointers:
+Route6Gate_ScriptPointers:
 	dw Route6GateScript0
 	dw Route6GateScript1
 
@@ -64,7 +64,7 @@ Route6GateScript_1e0a1:
 	ld [wOverrideSimulatedJoypadStatesMask], a
 	ret
 
-Route6GateTextPointers:
+Route6Gate_TextPointers:
 	dw Route6GateText1
 	dw Route6GateText2
 	dw Route6GateText3
diff --git a/scripts/route7.asm b/scripts/Route7.asm
index af353821..27d07a7a 100755
--- a/scripts/route7.asm
+++ b/scripts/Route7.asm
@@ -1,8 +1,8 @@
-Route7Script:
+Route7_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-Route7TextPointers:
+Route7_TextPointers:
 	dw Route7Text1
 
 Route7Text1:
diff --git a/scripts/route7gate.asm b/scripts/Route7Gate.asm
index 6e62c73c..724172c5 100755
--- a/scripts/route7gate.asm
+++ b/scripts/Route7Gate.asm
@@ -1,11 +1,11 @@
-Route7GateScript:
+Route7Gate_Script:
 	call EnableAutoTextBoxDrawing
 	ld a, [wRoute7GateCurScript]
-	ld hl, Route7GateScriptPointers
-	call JumpTable
+	ld hl, Route7Gate_ScriptPointers
+	call CallFunctionInTable
 	ret
 
-Route7GateScriptPointers:
+Route7Gate_ScriptPointers:
 	dw Route7GateScript0
 	dw Route7GateScript1
 
@@ -67,7 +67,7 @@ Route7GateScript1:
 	ld [wCurMapScript], a
 	ret
 
-Route7GateTextPointers:
+Route7Gate_TextPointers:
 	dw Route7GateText1
 	dw Route7GateText2
 	dw Route7GateText3
diff --git a/scripts/route8.asm b/scripts/Route8.asm
index 34e6aba4..f3388505 100755
--- a/scripts/route8.asm
+++ b/scripts/Route8.asm
@@ -1,18 +1,18 @@
-Route8Script:
+Route8_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route8TrainerHeaders
-	ld de, Route8ScriptPointers
+	ld hl, Route8TrainerHeader0
+	ld de, Route8_ScriptPointers
 	ld a, [wRoute8CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute8CurScript], a
 	ret
 
-Route8ScriptPointers:
+Route8_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route8TextPointers:
+Route8_TextPointers:
 	dw Route8Text1
 	dw Route8Text2
 	dw Route8Text3
@@ -24,7 +24,6 @@ Route8TextPointers:
 	dw Route8Text9
 	dw Route8Text10
 
-Route8TrainerHeaders:
 Route8TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_0
 	db ($4 << 4) ; trainer's view range
diff --git a/scripts/route8gate.asm b/scripts/Route8Gate.asm
index b86458d8..49f605a2 100755
--- a/scripts/route8gate.asm
+++ b/scripts/Route8Gate.asm
@@ -1,10 +1,10 @@
-Route8GateScript:
+Route8Gate_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route8GateScriptPointers
+	ld hl, Route8Gate_ScriptPointers
 	ld a, [wRoute8GateCurScript]
-	jp JumpTable
+	jp CallFunctionInTable
 
-Route8GateScriptPointers:
+Route8Gate_ScriptPointers:
 	dw Route8GateScript0
 	dw Route8GateScript1
 
@@ -64,7 +64,7 @@ Route8GateScript1:
 	ld [wRoute8GateCurScript], a
 	ret
 
-Route8GateTextPointers:
+Route8Gate_TextPointers:
 	dw Route8GateText1
 	dw Route8GateText2
 	dw Route8GateText3
diff --git a/scripts/route9.asm b/scripts/Route9.asm
index f08e9790..8b346ee8 100755
--- a/scripts/route9.asm
+++ b/scripts/Route9.asm
@@ -1,18 +1,18 @@
-Route9Script:
+Route9_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route9TrainerHeaders
-	ld de, Route9ScriptPointers
+	ld hl, Route9TrainerHeader0
+	ld de, Route9_ScriptPointers
 	ld a, [wRoute9CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute9CurScript], a
 	ret
 
-Route9ScriptPointers:
+Route9_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route9TextPointers:
+Route9_TextPointers:
 	dw Route9Text1
 	dw Route9TextAJ
 	dw Route9Text3
@@ -25,7 +25,6 @@ Route9TextPointers:
 	dw PickUpItemText
 	dw Route9Text11
 
-Route9TrainerHeaders:
 Route9TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_0
 	db ($3 << 4) ; trainer's view range
@@ -35,73 +34,73 @@ Route9TrainerHeader0:
 	dw Route9EndBattleText1 ; TextEndBattle
 	dw Route9EndBattleText1 ; TextEndBattle
 
-Route9TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_2
+Route9TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_1
 	dw Route9BattleTextAJ ; TextBeforeBattle
 	dw Route9AfterBattleTextAJ ; TextAfterBattle
 	dw Route9EndBattleTextAJ ; TextEndBattle
 	dw Route9EndBattleTextAJ ; TextEndBattle
 
-Route9TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_3
+Route9TrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_2
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_2
 	dw Route9BattleText3 ; TextBeforeBattle
 	dw Route9AfterBattleText3 ; TextAfterBattle
 	dw Route9EndBattleText3 ; TextEndBattle
 	dw Route9EndBattleText3 ; TextEndBattle
 
-Route9TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_4
+Route9TrainerHeader3:
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_3
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_3
 	dw Route9BattleText4 ; TextBeforeBattle
 	dw Route9AfterBattleText4 ; TextAfterBattle
 	dw Route9EndBattleText4 ; TextEndBattle
 	dw Route9EndBattleText4 ; TextEndBattle
 
-Route9TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_5
+Route9TrainerHeader4:
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_4
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_4
 	dw Route9BattleText5 ; TextBeforeBattle
 	dw Route9AfterBattleText5 ; TextAfterBattle
 	dw Route9EndBattleText5 ; TextEndBattle
 	dw Route9EndBattleText5 ; TextEndBattle
 
-Route9TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_6
+Route9TrainerHeader5:
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_5
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_6
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_5
 	dw Route9BattleText6 ; TextBeforeBattle
 	dw Route9AfterBattleText6 ; TextAfterBattle
 	dw Route9EndBattleText6 ; TextEndBattle
 	dw Route9EndBattleText6 ; TextEndBattle
 
-Route9TrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_7
+Route9TrainerHeader6:
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_6
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_7
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_6
 	dw Route9BattleText7 ; TextBeforeBattle
 	dw Route9AfterBattleText7 ; TextAfterBattle
 	dw Route9EndBattleText7 ; TextEndBattle
 	dw Route9EndBattleText7 ; TextEndBattle
 
-Route9TrainerHeader8:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_8, 1
+Route9TrainerHeader7:
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_7, 1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_8, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_7, 1
 	dw Route9BattleText8 ; TextBeforeBattle
 	dw Route9AfterBattleText8 ; TextAfterBattle
 	dw Route9EndBattleText8 ; TextEndBattle
 	dw Route9EndBattleText8 ; TextEndBattle
 
-Route9TrainerHeader9:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_9, 1
+Route9TrainerHeader8:
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_8, 1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_9, 1
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_8, 1
 	dw Route9BattleText9 ; TextBeforeBattle
 	dw Route9AfterBattleText9 ; TextAfterBattle
 	dw Route9EndBattleText9 ; TextEndBattle
@@ -116,42 +115,42 @@ Route9Text1:
 
 Route9TextAJ:
 	TX_ASM
-	ld hl, Route9TrainerHeader2
+	ld hl, Route9TrainerHeader1
 	jr Route9TalkToTrainer
 
 Route9Text3:
 	TX_ASM
-	ld hl, Route9TrainerHeader3
+	ld hl, Route9TrainerHeader2
 	jr Route9TalkToTrainer
 
 Route9Text4:
 	TX_ASM
-	ld hl, Route9TrainerHeader4
+	ld hl, Route9TrainerHeader3
 	jr Route9TalkToTrainer
 
 Route9Text5:
 	TX_ASM
-	ld hl, Route9TrainerHeader5
+	ld hl, Route9TrainerHeader4
 	jr Route9TalkToTrainer
 
 Route9Text6:
 	TX_ASM
-	ld hl, Route9TrainerHeader6
+	ld hl, Route9TrainerHeader5
 	jr Route9TalkToTrainer
 
 Route9Text7:
 	TX_ASM
-	ld hl, Route9TrainerHeader7
+	ld hl, Route9TrainerHeader6
 	jr Route9TalkToTrainer
 
 Route9Text8:
 	TX_ASM
-	ld hl, Route9TrainerHeader8
+	ld hl, Route9TrainerHeader7
 	jr Route9TalkToTrainer
 
 Route9Text9:
 	TX_ASM
-	ld hl, Route9TrainerHeader9
+	ld hl, Route9TrainerHeader8
 Route9TalkToTrainer:
 	call TalkToTrainer
 	jp TextScriptEnd
diff --git a/scripts/ssanne1.asm b/scripts/SSAnne1F.asm
index 3f8861d5..5cace6ee 100755
--- a/scripts/ssanne1.asm
+++ b/scripts/SSAnne1F.asm
@@ -1,8 +1,8 @@
-SSAnne1Script:
+SSAnne1F_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-SSAnne1TextPointers:
+SSAnne1F_TextPointers:
 	dw SSAnne1Text1
 	dw SSAnne1Text2
 
diff --git a/scripts/ssanne8.asm b/scripts/SSAnne1FRooms.asm
index e7cbef3e..2371f286 100755
--- a/scripts/ssanne8.asm
+++ b/scripts/SSAnne1FRooms.asm
@@ -1,18 +1,18 @@
-SSAnne8Script:
+SSAnne1FRooms_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, SSAnne8TrainerHeaders
-	ld de, SSAnne8ScriptPointers
-	ld a, [wSSAnne8CurScript]
+	ld hl, SSAnne8TrainerHeader0
+	ld de, SSAnne1FRooms_ScriptPointers
+	ld a, [wSSAnne1FRoomsCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSSAnne8CurScript], a
+	ld [wSSAnne1FRoomsCurScript], a
 	ret
 
-SSAnne8ScriptPointers:
+SSAnne1FRooms_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SSAnne8TextPointers:
+SSAnne1FRooms_TextPointers:
 	dw SSAnne8Text1
 	dw SSAnne8Text2
 	dw SSAnne8Text3
@@ -25,7 +25,6 @@ SSAnne8TextPointers:
 	dw PickUpItemText
 	dw SSAnne8Text11
 
-SSAnne8TrainerHeaders:
 SSAnne8TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_8_TRAINER_0
 	db ($2 << 4) ; trainer's view range
diff --git a/scripts/ssanne2.asm b/scripts/SSAnne2F.asm
index 4f0ffa2f..77b283d2 100755
--- a/scripts/ssanne2.asm
+++ b/scripts/SSAnne2F.asm
@@ -1,16 +1,16 @@
-SSAnne2Script:
+SSAnne2F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, SSAnne2ScriptPointers
-	ld a, [wSSAnne2CurScript]
-	jp JumpTable
+	ld hl, SSAnne2F_ScriptPointers
+	ld a, [wSSAnne2FCurScript]
+	jp CallFunctionInTable
 
 SSAnne2Script_613ab:
 	xor a
 	ld [wJoyIgnore], a
-	ld [wSSAnne2CurScript], a
+	ld [wSSAnne2FCurScript], a
 	ret
 
-SSAnne2ScriptPointers:
+SSAnne2F_ScriptPointers:
 	dw SSAnne2Script0
 	dw SSAnne2Script1
 	dw SSAnne2Script2
@@ -30,7 +30,7 @@ SSAnne2Script0:
 	call PlayMusic
 	ld a, [wCoordIndex]
 	ld [$ffdb], a
-	ld a, HS_SS_ANNE_2_RIVAL
+	ld a, HS_SS_ANNE_2F_RIVAL
 	ld [wMissableObjectIndex], a
 	predef ShowObject
 	call Delay3
@@ -51,7 +51,7 @@ SSAnne2Script0:
 .asm_61403
 	call MoveSprite
 	ld a, $1
-	ld [wSSAnne2CurScript], a
+	ld [wSSAnne2FCurScript], a
 	ret
 
 MovementData_6140c:
@@ -101,7 +101,7 @@ SSAnne2Script1:
 	ld [wTrainerNo], a
 	call SSAnne2Script_61416
 	ld a, $2
-	ld [wSSAnne2CurScript], a
+	ld [wSSAnne2FCurScript], a
 	ret
 
 SSAnne2Script2:
@@ -131,7 +131,7 @@ SSAnne2Script2:
 	call StopAllMusic
 	callba Music_RivalAlternateStart
 	ld a, $3
-	ld [wSSAnne2CurScript], a
+	ld [wSSAnne2FCurScript], a
 	ret
 
 MovementData_614b7:
@@ -151,15 +151,15 @@ SSAnne2Script3:
 	ret nz
 	xor a
 	ld [wJoyIgnore], a
-	ld a, HS_SS_ANNE_2_RIVAL
+	ld a, HS_SS_ANNE_2F_RIVAL
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	call PlayDefaultMusic
 	ld a, $4
-	ld [wSSAnne2CurScript], a
+	ld [wSSAnne2FCurScript], a
 	ret
 
-SSAnne2TextPointers:
+SSAnne2F_TextPointers:
 	dw SSAnne2Text1
 	dw SSAnne2Text2
 	dw SSAnne2Text3
diff --git a/scripts/ssanne9.asm b/scripts/SSAnne2FRooms.asm
index 6e658e5f..fb57cf37 100755
--- a/scripts/ssanne9.asm
+++ b/scripts/SSAnne2FRooms.asm
@@ -1,18 +1,18 @@
-SSAnne9Script:
+SSAnne2FRooms_Script:
 	call DisableAutoTextBoxDrawing
-	ld hl, SSAnne9TrainerHeaders
-	ld de, SSAnne9ScriptPointers
-	ld a, [wSSAnne9CurScript]
+	ld hl, SSAnne9TrainerHeader0
+	ld de, SSAnne2FRooms_ScriptPointers
+	ld a, [wSSAnne2FRoomsCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSSAnne9CurScript], a
+	ld [wSSAnne2FRoomsCurScript], a
 	ret
 
-SSAnne9ScriptPointers:
+SSAnne2FRooms_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SSAnne9TextPointers:
+SSAnne2FRooms_TextPointers:
 	dw SSAnne9Text1
 	dw SSAnne9Text2
 	dw SSAnne9Text3
@@ -27,7 +27,6 @@ SSAnne9TextPointers:
 	dw SSAnne9Text12
 	dw SSAnne9Text13
 
-SSAnne9TrainerHeaders:
 SSAnne9TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_9_TRAINER_0
 	db ($2 << 4) ; trainer's view range
diff --git a/scripts/ssanne9_2.asm b/scripts/SSAnne2FRooms_2.asm
index f856221c..f856221c 100755
--- a/scripts/ssanne9_2.asm
+++ b/scripts/SSAnne2FRooms_2.asm
diff --git a/scripts/ssanne3.asm b/scripts/SSAnne3F.asm
index e681591a..5da0e0c7 100755
--- a/scripts/ssanne3.asm
+++ b/scripts/SSAnne3F.asm
@@ -1,7 +1,7 @@
-SSAnne3Script:
+SSAnne3F_Script:
 	jp EnableAutoTextBoxDrawing
 
-SSAnne3TextPointers:
+SSAnne3F_TextPointers:
 	dw SSAnne3Text1
 
 SSAnne3Text1:
diff --git a/scripts/SSAnneB1F.asm b/scripts/SSAnneB1F.asm
new file mode 100755
index 00000000..25df076f
--- /dev/null
+++ b/scripts/SSAnneB1F.asm
@@ -0,0 +1,5 @@
+SSAnneB1F_Script:
+	jp EnableAutoTextBoxDrawing
+
+SSAnneB1F_TextPointers:
+	db "@"
diff --git a/scripts/ssanne10.asm b/scripts/SSAnneB1FRooms.asm
index 45c8dba5..3777852c 100755
--- a/scripts/ssanne10.asm
+++ b/scripts/SSAnneB1FRooms.asm
@@ -1,18 +1,18 @@
-SSAnne10Script:
+SSAnneB1FRooms_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, SSAnne10TrainerHeaders
-	ld de, SSAnne10ScriptPointers
-	ld a, [wSSAnne10CurScript]
+	ld hl, SSAnne10TrainerHeader0
+	ld de, SSAnneB1FRooms_ScriptPointers
+	ld a, [wSSAnneB1FRoomsCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSSAnne10CurScript], a
+	ld [wSSAnneB1FRoomsCurScript], a
 	ret
 
-SSAnne10ScriptPointers:
+SSAnneB1FRooms_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SSAnne10TextPointers:
+SSAnneB1FRooms_TextPointers:
 	dw SSAnne10Text1
 	dw SSAnne10Text2
 	dw SSAnne10Text3
@@ -25,7 +25,6 @@ SSAnne10TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
-SSAnne10TrainerHeaders:
 SSAnne10TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_10_TRAINER_0
 	db ($2 << 4) ; trainer's view range
diff --git a/scripts/ssanne5.asm b/scripts/SSAnneBow.asm
index a398a381..4569f0f8 100755
--- a/scripts/ssanne5.asm
+++ b/scripts/SSAnneBow.asm
@@ -1,25 +1,24 @@
-SSAnne5Script:
+SSAnneBow_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, SSAnne5TrainerHeader0
-	ld de, SSAnne5ScriptPointers
-	ld a, [wSSAnne5CurScript]
+	ld de, SSAnneBow_ScriptPointers
+	ld a, [wSSAnneBowCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSSAnne5CurScript], a
+	ld [wSSAnneBowCurScript], a
 	ret
 
-SSAnne5ScriptPointers:
+SSAnneBow_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SSAnne5TextPointers:
+SSAnneBow_TextPointers:
 	dw SSAnne5Text1
 	dw SSAnne5Text2
 	dw SSAnne5Text3
 	dw SSAnne5Text4
 	dw SSAnne5Text5
 
-SSAnne5TrainerHeaders:
 SSAnne5TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SS_ANNE_5_TRAINER_0
 	db ($3 << 4) ; trainer's view range
diff --git a/scripts/ssanne7.asm b/scripts/SSAnneCaptainsRoom.asm
index 1f53d1be..94918118 100755
--- a/scripts/ssanne7.asm
+++ b/scripts/SSAnneCaptainsRoom.asm
@@ -1,4 +1,4 @@
-SSAnne7Script:
+SSAnneCaptainsRoom_Script:
 	call SSAnne7Script_6189b
 	jp EnableAutoTextBoxDrawing
 
@@ -9,7 +9,7 @@ SSAnne7Script_6189b:
 	set 5, [hl]
 	ret
 
-SSAnne7TextPointers:
+SSAnneCaptainsRoom_TextPointers:
 	dw SSAnne7Text1
 	dw SSAnne7Text2
 	dw SSAnne7Text3
@@ -71,7 +71,8 @@ ReceivingHM01Text:
 
 ReceivedHM01Text:
 	TX_FAR _ReceivedHM01Text
-	db $11, "@"
+	TX_SFX_KEY_ITEM
+	db "@"
 
 SSAnne7Text_61932:
 	TX_FAR _SSAnne7Text_61932
diff --git a/scripts/ssanne6.asm b/scripts/SSAnneKitchen.asm
index e1998858..137706a0 100755
--- a/scripts/ssanne6.asm
+++ b/scripts/SSAnneKitchen.asm
@@ -1,8 +1,8 @@
-SSAnne6Script:
+SSAnneKitchen_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-SSAnne6TextPointers:
+SSAnneKitchen_TextPointers:
 	dw SSAnne6Text1
 	dw SSAnne6Text2
 	dw SSAnne6Text3
diff --git a/scripts/safarizonecenter.asm b/scripts/SafariZoneCenter.asm
index d796c403..0a266887 100755
--- a/scripts/safarizonecenter.asm
+++ b/scripts/SafariZoneCenter.asm
@@ -1,7 +1,7 @@
-SafariZoneCenterScript:
+SafariZoneCenter_Script:
 	jp EnableAutoTextBoxDrawing
 
-SafariZoneCenterTextPointers:
+SafariZoneCenter_TextPointers:
 	dw PickUpItemText
 	dw SafariZoneCenterText2
 	dw SafariZoneCenterText3
diff --git a/scripts/safarizoneresthouse1.asm b/scripts/SafariZoneCenterRestHouse.asm
index 1d43890d..a652644b 100755
--- a/scripts/safarizoneresthouse1.asm
+++ b/scripts/SafariZoneCenterRestHouse.asm
@@ -1,7 +1,7 @@
-SafariZoneRestHouse1Script:
+SafariZoneCenterRestHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-SafariZoneRestHouse1TextPointers:
+SafariZoneCenterRestHouse_TextPointers:
 	dw SafariZoneRestHouse1Text1
 	dw SafariZoneRestHouse1Text2
 
diff --git a/scripts/safarizoneeast.asm b/scripts/SafariZoneEast.asm
index 25d0ee30..7f4a5543 100755
--- a/scripts/safarizoneeast.asm
+++ b/scripts/SafariZoneEast.asm
@@ -1,7 +1,7 @@
-SafariZoneEastScript:
+SafariZoneEast_Script:
 	jp EnableAutoTextBoxDrawing
 
-SafariZoneEastTextPointers:
+SafariZoneEast_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 	dw PickUpItemText
diff --git a/scripts/safarizoneresthouse3.asm b/scripts/SafariZoneEastRestHouse.asm
index 18c4770f..24141459 100755
--- a/scripts/safarizoneresthouse3.asm
+++ b/scripts/SafariZoneEastRestHouse.asm
@@ -1,8 +1,8 @@
-SafariZoneRestHouse3Script:
+SafariZoneEastRestHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-SafariZoneRestHouse3TextPointers:
+SafariZoneEastRestHouse_TextPointers:
 	dw SafariZoneRestHouse3Text1
 	dw SafariZoneRestHouse3Text2
 	dw SafariZoneRestHouse3Text3
diff --git a/scripts/safarizoneentrance.asm b/scripts/SafariZoneGate.asm
index 063a6d0b..217001dd 100755
--- a/scripts/safarizoneentrance.asm
+++ b/scripts/SafariZoneGate.asm
@@ -1,11 +1,11 @@
-SafariZoneEntranceScript:
+SafariZoneGate_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, SafariZoneEntranceScriptPointers
-	ld a, [wSafariZoneEntranceCurScript]
-	call JumpTable
+	ld hl, SafariZoneGate_ScriptPointers
+	ld a, [wSafariZoneGateCurScript]
+	call CallFunctionInTable
 	ret
 
-SafariZoneEntranceScriptPointers:
+SafariZoneGate_ScriptPointers:
 	dw .SafariZoneEntranceScript0
 	dw .SafariZoneEntranceScript1
 	dw .SafariZoneEntranceScript2
@@ -31,7 +31,7 @@ SafariZoneEntranceScriptPointers:
 	cp $1
 	jr z, .asm_7520f
 	ld a, $2
-	ld [wSafariZoneEntranceCurScript], a
+	ld [wSafariZoneGateCurScript], a
 	ret
 .asm_7520f
 	ld a, D_RIGHT
@@ -40,7 +40,7 @@ SafariZoneEntranceScriptPointers:
 	ld a, $f0
 	ld [wJoyIgnore], a
 	ld a, $1
-	ld [wSafariZoneEntranceCurScript], a
+	ld [wSafariZoneGateCurScript], a
 	ret
 
 .CoordsData_75221:
@@ -69,7 +69,7 @@ SafariZoneEntranceScriptPointers:
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $5
-	ld [wSafariZoneEntranceCurScript], a
+	ld [wSafariZoneGateCurScript], a
 	ret
 
 .SafariZoneEntranceScript5
@@ -92,7 +92,7 @@ SafariZoneEntranceScriptPointers:
 	ld c, $3
 	call SafariZoneEntranceAutoWalk
 	ld a, $4
-	ld [wSafariZoneEntranceCurScript], a
+	ld [wSafariZoneGateCurScript], a
 	jr .asm_75286
 .asm_7527f
 	ld a, $5
@@ -107,7 +107,7 @@ SafariZoneEntranceScriptPointers:
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $0
-	ld [wSafariZoneEntranceCurScript], a
+	ld [wSafariZoneGateCurScript], a
 	ret
 
 .SafariZoneEntranceScript6
@@ -115,7 +115,7 @@ SafariZoneEntranceScriptPointers:
 	ret nz
 	call Delay3
 	ld a, [wcf0d]
-	ld [wSafariZoneEntranceCurScript], a
+	ld [wSafariZoneGateCurScript], a
 	ret
 
 SafariZoneEntranceAutoWalk:
@@ -133,7 +133,7 @@ SafariZoneEntranceScript_752b4:
 	and a
 	ret
 
-SafariZoneEntranceTextPointers:
+SafariZoneGate_TextPointers:
 	dw .SafariZoneEntranceText1
 	dw .SafariZoneEntranceText2
 	dw .SafariZoneEntranceText1
@@ -180,7 +180,7 @@ SafariZoneEntranceTextPointers:
 	ld [wcf0d], a
 .asm_753b3
 	ld a, $6
-	ld [wSafariZoneEntranceCurScript], a
+	ld [wSafariZoneGateCurScript], a
 	jp TextScriptEnd
 
 .SafariZoneEntranceText_753bb
diff --git a/scripts/safarizoneentrance2.asm b/scripts/SafariZoneGate2.asm
index 4a6c23e6..a99bad6a 100755
--- a/scripts/safarizoneentrance2.asm
+++ b/scripts/SafariZoneGate2.asm
@@ -66,7 +66,7 @@ Func_f1f77:
 	SetEvent EVENT_IN_SAFARI_ZONE
 	ResetEventReuseHL EVENT_SAFARI_GAME_OVER
 	ld a, $3
-	ld [wSafariZoneEntranceCurScript], a
+	ld [wSafariZoneGateCurScript], a
 	jr .asm_f2024
 .declined:
 	ld hl, .PleaseComeAgainText
@@ -76,7 +76,7 @@ Func_f1f77:
 	ld c, 1
 	call SafariZoneEntranceStartSimulatingJoypadStates
 	ld a, $4
-	ld [wSafariZoneEntranceCurScript], a
+	ld [wSafariZoneGateCurScript], a
 .asm_f2024
 	ret
 
@@ -86,7 +86,7 @@ Func_f1f77:
 
 .MakePaymentText
 	TX_FAR SafariZoneEntranceText_9e747
-	TX_SFX_ITEM
+	TX_SFX_ITEM_1
 	TX_FAR _SafariZoneEntranceText_75360
 	db "@"
 
@@ -208,7 +208,7 @@ SafariZoneEntranceGetLowCostAdmissionText:
 
 SafariZoneEntranceText_f20f6:
 	TX_FAR _SafariZoneLowCostText3
-	TX_SFX_ITEM
+	TX_SFX_ITEM_1
 	TX_FAR _SafariZoneLowCostText4
 	db "@"
 
diff --git a/scripts/safarizonenorth.asm b/scripts/SafariZoneNorth.asm
index b870c99e..734328b4 100755
--- a/scripts/safarizonenorth.asm
+++ b/scripts/SafariZoneNorth.asm
@@ -1,7 +1,7 @@
-SafariZoneNorthScript:
+SafariZoneNorth_Script:
 	jp EnableAutoTextBoxDrawing
 
-SafariZoneNorthTextPointers:
+SafariZoneNorth_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 	dw SafariZoneNorthText3
diff --git a/scripts/safarizoneresthouse4.asm b/scripts/SafariZoneNorthRestHouse.asm
index 3ff3fa48..fdc438f4 100755
--- a/scripts/safarizoneresthouse4.asm
+++ b/scripts/SafariZoneNorthRestHouse.asm
@@ -1,8 +1,8 @@
-SafariZoneRestHouse4Script:
+SafariZoneNorthRestHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-SafariZoneRestHouse4TextPointers:
+SafariZoneNorthRestHouse_TextPointers:
 	dw SafariZoneRestHouse4Text1
 	dw SafariZoneRestHouse4Text2
 	dw SafariZoneRestHouse4Text3
diff --git a/scripts/safarizonesecrethouse.asm b/scripts/SafariZoneSecretHouse.asm
index 37013b3b..2d9b2305 100755
--- a/scripts/safarizonesecrethouse.asm
+++ b/scripts/SafariZoneSecretHouse.asm
@@ -1,7 +1,7 @@
-SafariZoneSecretHouseScript:
+SafariZoneSecretHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-SafariZoneSecretHouseTextPointers:
+SafariZoneSecretHouse_TextPointers:
 	dw SafariZoneSecretHouseText1
 
 SafariZoneSecretHouseText1:
@@ -33,7 +33,8 @@ SafariZoneSecretHouseText_4a350:
 
 ReceivedHM03Text:
 	TX_FAR _ReceivedHM03Text
-	db $0B, "@"
+	TX_SFX_ITEM_1
+	db "@"
 
 HM03ExplanationText:
 	TX_FAR _HM03ExplanationText
diff --git a/scripts/safarizonewest.asm b/scripts/SafariZoneWest.asm
index 81190c4c..483a92ee 100755
--- a/scripts/safarizonewest.asm
+++ b/scripts/SafariZoneWest.asm
@@ -1,7 +1,7 @@
-SafariZoneWestScript:
+SafariZoneWest_Script:
 	jp EnableAutoTextBoxDrawing
 
-SafariZoneWestTextPointers:
+SafariZoneWest_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 	dw PickUpItemText
diff --git a/scripts/safarizoneresthouse2.asm b/scripts/SafariZoneWestRestHouse.asm
index 4cd512f2..371bd56c 100755
--- a/scripts/safarizoneresthouse2.asm
+++ b/scripts/SafariZoneWestRestHouse.asm
@@ -1,8 +1,8 @@
-SafariZoneRestHouse2Script:
+SafariZoneWestRestHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-SafariZoneRestHouse2TextPointers:
+SafariZoneWestRestHouse_TextPointers:
 	dw SafariZoneRestHouse2Text1
 	dw SafariZoneRestHouse2Text2
 	dw SafariZoneRestHouse2Text3
diff --git a/scripts/saffroncity.asm b/scripts/SaffronCity.asm
index 4653f150..02e6e2bb 100755
--- a/scripts/saffroncity.asm
+++ b/scripts/SaffronCity.asm
@@ -1,7 +1,7 @@
-SaffronCityScript:
+SaffronCity_Script:
 	jp EnableAutoTextBoxDrawing
 
-SaffronCityTextPointers:
+SaffronCity_TextPointers:
 	dw SaffronCityText1
 	dw SaffronCityText2
 	dw SaffronCityText3
@@ -74,7 +74,8 @@ SaffronCityText11:
 
 SaffronCityText12:
 	TX_FAR _SaffronCityText12
-	db $15, "@" ; play PIDGEOT cry from TextCommandSounds
+	TX_CRY_PIDGEOT
+	db "@"
 
 SaffronCityText13:
 	TX_FAR _SaffronCityText13
diff --git a/scripts/saffrongym.asm b/scripts/SaffronGym.asm
index f82b5ccd..0539d613 100755
--- a/scripts/saffrongym.asm
+++ b/scripts/SaffronGym.asm
@@ -1,11 +1,11 @@
-SaffronGymScript:
+SaffronGym_Script:
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
 	call nz, .extra
 	call EnableAutoTextBoxDrawing
 	ld hl, SaffronGymTrainerHeader0
-	ld de, SaffronGymScriptPointers
+	ld de, SaffronGym_ScriptPointers
 	ld a, [wSaffronGymCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wSaffronGymCurScript], a
@@ -29,7 +29,7 @@ SaffronGymText_5d048:
 	ld [wCurMapScript], a
 	ret
 
-SaffronGymScriptPointers:
+SaffronGym_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -70,7 +70,7 @@ SaffronGymText_5d068:
 
 	jp SaffronGymText_5d048
 
-SaffronGymTextPointers:
+SaffronGym_TextPointers:
 	dw SaffronGymText1
 	dw SaffronGymText2
 	dw SaffronGymText3
@@ -84,7 +84,6 @@ SaffronGymTextPointers:
 	dw SaffronGymText11
 	dw SaffronGymText12
 
-SaffronGymTrainerHeaders:
 SaffronGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SAFFRON_GYM_TRAINER_0
 	db ($3 << 4) ; trainer's view range
@@ -189,8 +188,8 @@ SaffronGymText_5d162:
 
 SaffronGymText_5d167:
 	TX_FAR _SaffronGymText_5d167
-	db $11 ; play same sound as red giving oak parcel
-	db $6 ; wait for keypress
+	TX_SFX_KEY_ITEM ; actually plays the second channel of SFX_BALL_POOF due to the wrong music bank being loaded
+	TX_BLINK
 	db "@"
 
 SaffronGymText_5d16e:
@@ -203,7 +202,7 @@ SaffronGymText10:
 
 SaffronGymText11:
 	TX_FAR ReceivedTM46Text
-	db $b
+	TX_SFX_ITEM_1
 	TX_FAR _TM46ExplanationText
 	db "@"
 
diff --git a/scripts/saffronmart.asm b/scripts/SaffronMart.asm
index 8b140610..ebb3cddf 100755
--- a/scripts/saffronmart.asm
+++ b/scripts/SaffronMart.asm
@@ -1,7 +1,7 @@
-SaffronMartScript:
+SaffronMart_Script:
 	jp EnableAutoTextBoxDrawing
 
-SaffronMartTextPointers:
+SaffronMart_TextPointers:
 	dw SaffronCashierText
 	dw SaffronMartText2
 	dw SaffronMartText3
diff --git a/scripts/saffronhouse1.asm b/scripts/SaffronPidgeyHouse.asm
index 5f417978..f38fbfdb 100755
--- a/scripts/saffronhouse1.asm
+++ b/scripts/SaffronPidgeyHouse.asm
@@ -1,7 +1,7 @@
-SaffronHouse1Script:
+SaffronPidgeyHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-SaffronHouse1TextPointers:
+SaffronPidgeyHouse_TextPointers:
 	dw SaffronHouse1Text1
 	dw SaffronHouse1Text2
 	dw SaffronHouse1Text3
diff --git a/scripts/saffronpokecenter.asm b/scripts/SaffronPokecenter.asm
index 46667927..435367ea 100755
--- a/scripts/saffronpokecenter.asm
+++ b/scripts/SaffronPokecenter.asm
@@ -1,8 +1,8 @@
-SaffronPokecenterScript:
+SaffronPokecenter_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-SaffronPokecenterTextPointers:
+SaffronPokecenter_TextPointers:
 	dw SaffronHealNurseText
 	dw SaffronPokecenterText2
 	dw SaffronPokecenterText3
diff --git a/scripts/seafoamislands1.asm b/scripts/SeafoamIslands1F.asm
index 52561fa7..b024a6bd 100755
--- a/scripts/seafoamislands1.asm
+++ b/scripts/SeafoamIslands1F.asm
@@ -1,4 +1,4 @@
-SeafoamIslands1Script:
+SeafoamIslands1F_Script:
 	call EnableAutoTextBoxDrawing
 	SetEvent EVENT_IN_SEAFOAM_ISLANDS
 	ld hl, wFlags_0xcd60
@@ -13,16 +13,16 @@ SeafoamIslands1Script:
 	cp $1
 	jr nz, .asm_44819
 	SetEventReuseHL EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_1
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_1
 	ld [wObjectToShow], a
 	jr .asm_44825
 .asm_44819
 	SetEventAfterBranchReuseHL EVENT_SEAFOAM1_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_2
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_2
 	ld [wObjectToShow], a
 .asm_44825
 	ld a, [wObjectToHide]
@@ -32,7 +32,7 @@ SeafoamIslands1Script:
 	ld [wMissableObjectIndex], a
 	predef_jump ShowObject
 .asm_4483b
-	ld a, $9f
+	ld a, SEAFOAM_ISLANDS_B1F
 	ld [wDungeonWarpDestinationMap], a
 	ld hl, Seafoam1HolesCoords
 	jp IsPlayerOnDungeonWarp
@@ -42,6 +42,6 @@ Seafoam1HolesCoords:
 	db $06,$18
 	db $ff
 
-SeafoamIslands1TextPointers:
+SeafoamIslands1F_TextPointers:
 	dw BoulderText
 	dw BoulderText
diff --git a/scripts/seafoamislands2.asm b/scripts/SeafoamIslandsB1F.asm
index 50024bad..a4c5767b 100755
--- a/scripts/seafoamislands2.asm
+++ b/scripts/SeafoamIslandsB1F.asm
@@ -1,4 +1,4 @@
-SeafoamIslands2Script:
+SeafoamIslandsB1F_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, wFlags_0xcd60
 	bit 7, [hl]
@@ -12,16 +12,16 @@ SeafoamIslands2Script:
 	cp $1
 	jr nz, .asm_46340
 	SetEventReuseHL EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_1
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_1
 	ld [wObjectToShow], a
 	jr .asm_4634c
 .asm_46340
 	SetEventAfterBranchReuseHL EVENT_SEAFOAM2_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_2
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_2
 	ld [wObjectToShow], a
 .asm_4634c
 	ld a, [wObjectToHide]
@@ -31,7 +31,7 @@ SeafoamIslands2Script:
 	ld [wMissableObjectIndex], a
 	predef_jump ShowObject
 .asm_46362
-	ld a, $a0
+	ld a, SEAFOAM_ISLANDS_B2F
 	ld [wDungeonWarpDestinationMap], a
 	ld hl, Seafoam2HolesCoords
 	jp IsPlayerOnDungeonWarp
@@ -41,6 +41,6 @@ Seafoam2HolesCoords:
 	db $06,$17
 	db $ff
 
-SeafoamIslands2TextPointers:
+SeafoamIslandsB1F_TextPointers:
 	dw BoulderText
 	dw BoulderText
diff --git a/scripts/seafoamislands3.asm b/scripts/SeafoamIslandsB2F.asm
index 4a7848a4..eb6d2437 100755
--- a/scripts/seafoamislands3.asm
+++ b/scripts/SeafoamIslandsB2F.asm
@@ -1,4 +1,4 @@
-SeafoamIslands3Script:
+SeafoamIslandsB2F_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, wFlags_0xcd60
 	bit 7, [hl]
@@ -12,16 +12,16 @@ SeafoamIslands3Script:
 	cp $1
 	jr nz, .asm_4647c
 	SetEventReuseHL EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_1
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_3
+	ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_3
 	ld [wObjectToShow], a
 	jr .asm_46488
 .asm_4647c
 	SetEventAfterBranchReuseHL EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_2
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_4
+	ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_4
 	ld [wObjectToShow], a
 .asm_46488
 	ld a, [wObjectToHide]
@@ -31,7 +31,7 @@ SeafoamIslands3Script:
 	ld [wMissableObjectIndex], a
 	predef_jump ShowObject
 .asm_4649e
-	ld a, $a1
+	ld a, SEAFOAM_ISLANDS_B3F
 	ld [wDungeonWarpDestinationMap], a
 	ld hl, Seafoam3HolesCoords
 	jp IsPlayerOnDungeonWarp
@@ -41,6 +41,6 @@ Seafoam3HolesCoords:
 	db $06,$16
 	db $ff
 
-SeafoamIslands3TextPointers:
+SeafoamIslandsB2F_TextPointers:
 	dw BoulderText
 	dw BoulderText
diff --git a/scripts/seafoamislands4.asm b/scripts/SeafoamIslandsB3F.asm
index a1e4b1d8..c8fec338 100755
--- a/scripts/seafoamislands4.asm
+++ b/scripts/SeafoamIslandsB3F.asm
@@ -1,4 +1,4 @@
-SeafoamIslands4Script:
+SeafoamIslandsB3F_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, wFlags_0xcd60
 	bit 7, [hl]
@@ -12,16 +12,16 @@ SeafoamIslands4Script:
 	cp $1
 	jr nz, .asm_465b8
 	SetEventReuseHL EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_1
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_1
 	ld [wObjectToShow], a
 	jr .asm_465c4
 .asm_465b8
 	SetEventAfterBranchReuseHL EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_2
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_2
 	ld [wObjectToShow], a
 .asm_465c4
 	ld a, [wObjectToHide]
@@ -32,7 +32,7 @@ SeafoamIslands4Script:
 	predef ShowObject
 	jr .asm_465ed
 .asm_465dc
-	ld a, $a2
+	ld a, SEAFOAM_ISLANDS_B4F
 	ld [wDungeonWarpDestinationMap], a
 	ld hl, Seafoam4HolesCoords
 	call IsPlayerOnDungeonWarp
@@ -40,16 +40,16 @@ SeafoamIslands4Script:
 	bit 4, a
 	ret nz
 .asm_465ed
-	ld hl, SeafoamIslands4ScriptPointers
-	ld a, [wSeafoamIslands4CurScript]
-	jp JumpTable
+	ld hl, SeafoamIslandsB3F_ScriptPointers
+	ld a, [wSeafoamIslandsB3FCurScript]
+	jp CallFunctionInTable
 
 Seafoam4HolesCoords:
 	db $10,$03
 	db $10,$06
 	db $ff
 
-SeafoamIslands4ScriptPointers:
+SeafoamIslandsB3F_ScriptPointers:
 	dw SeafoamIslands4Script0
 	dw SeafoamIslands4Script1
 	dw SeafoamIslands4Script2
@@ -73,7 +73,7 @@ SeafoamIslands4Script0:
 	ld hl, wFlags_D733
 	set 2, [hl]
 	ld a, $1
-	ld [wSeafoamIslands4CurScript], a
+	ld [wSeafoamIslandsB3FCurScript], a
 	ret
 
 RLEMovement46632:
@@ -87,7 +87,7 @@ SeafoamIslands4Script1:
 	and a
 	ret nz
 	ld a, $0
-	ld [wSeafoamIslands4CurScript], a
+	ld [wSeafoamIslandsB3FCurScript], a
 	ret
 
 SeafoamIslands4Script2:
@@ -116,7 +116,7 @@ SeafoamIslands4Script2:
 	set 2, [hl]
 	ld a, $3
 .asm_4667b
-	ld [wSeafoamIslands4CurScript], a
+	ld [wSeafoamIslandsB3FCurScript], a
 	ret
 
 RLEData_4667f:
@@ -137,10 +137,10 @@ SeafoamIslands4Script3:
 	and a
 	ret nz
 	ld a, $0
-	ld [wSeafoamIslands4CurScript], a
+	ld [wSeafoamIslandsB3FCurScript], a
 	ret
 
-SeafoamIslands4TextPointers:
+SeafoamIslandsB3F_TextPointers:
 	dw BoulderText
 	dw BoulderText
 	dw BoulderText
diff --git a/scripts/seafoamislands5.asm b/scripts/SeafoamIslandsB4F.asm
index 478946fa..1383a561 100755
--- a/scripts/seafoamislands5.asm
+++ b/scripts/SeafoamIslandsB4F.asm
@@ -1,17 +1,17 @@
-SeafoamIslands5Script:
+SeafoamIslandsB4F_Script:
 	call EnableAutoTextBoxDrawing
-	ld a, [wSeafoamIslands5CurScript]
-	ld hl, SeafoamIslands5ScriptPointers
-	jp JumpTable
+	ld a, [wSeafoamIslandsB4FCurScript]
+	ld hl, SeafoamIslandsB4F_ScriptPointers
+	jp CallFunctionInTable
 
 SeafoamIslands5Script_467a5:
 	xor a
 	ld [wJoyIgnore], a
-	ld [wSeafoamIslands5CurScript], a
+	ld [wSeafoamIslandsB4FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-SeafoamIslands5ScriptPointers:
+SeafoamIslandsB4F_ScriptPointers:
 	dw SeafoamIslands5Script0
 	dw SeafoamIslands5Script1
 	dw SeafoamIslands5Script2
@@ -24,7 +24,7 @@ SeafoamIslands5Script4:
 	jr z, SeafoamIslands5Script_467a5
 	call EndTrainerBattle
 	ld a, $0
-	ld [wSeafoamIslands5CurScript], a
+	ld [wSeafoamIslandsB4FCurScript], a
 	ret
 
 SeafoamIslands5Script0:
@@ -50,7 +50,7 @@ SeafoamIslands5Script0:
 	ld hl, wFlags_D733
 	res 2, [hl]
 	ld a, $1
-	ld [wSeafoamIslands5CurScript], a
+	ld [wSeafoamIslandsB4FCurScript], a
 	ret
 
 .Coords
@@ -67,7 +67,7 @@ SeafoamIslands5Script1:
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $0
-	ld [wSeafoamIslands5CurScript], a
+	ld [wSeafoamIslandsB4FCurScript], a
 	ret
 
 SeafoamIslands5Script2:
@@ -93,7 +93,7 @@ SeafoamIslands5Script2:
 	call StartSimulatingJoypadStates
 	ld a, $3
 .asm_46849
-	ld [wSeafoamIslands5CurScript], a
+	ld [wSeafoamIslandsB4FCurScript], a
 	ret
 
 .Coords
@@ -122,7 +122,7 @@ SeafoamIslands5Script3:
 	and a
 	ret nz
 	ld a, $0
-	ld [wSeafoamIslands5CurScript], a
+	ld [wSeafoamIslandsB4FCurScript], a
 	ret
 
 SeaFoamIslands5Script_46872:
@@ -131,7 +131,7 @@ SeaFoamIslands5Script_46872:
 	ld [wWalkBikeSurfStateCopy], a
 	jp ForceBikeOrSurf
 
-SeafoamIslands5TextPointers:
+SeafoamIslandsB4F_TextPointers:
 	dw BoulderText
 	dw BoulderText
 	dw ArticunoText
@@ -154,7 +154,7 @@ ArticunoText:
 	ld hl, ArticunoTrainerHeader
 	call TalkToTrainer
 	ld a, $4
-	ld [wSeafoamIslands5CurScript], a
+	ld [wSeafoamIslandsB4FCurScript], a
 	jp TextScriptEnd
 
 ArticunoBattleText:
diff --git a/scripts/silphco10.asm b/scripts/SilphCo10F.asm
index 6b35a05a..40506682 100755
--- a/scripts/silphco10.asm
+++ b/scripts/SilphCo10F.asm
@@ -1,11 +1,11 @@
-SilphCo10Script:
+SilphCo10F_Script:
 	call SilphCo10Script_5a14f
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo10TrainerHeaders
-	ld de, SilphCo10ScriptPointers
-	ld a, [wSilphCo10CurScript]
+	ld hl, SilphCo10TrainerHeader0
+	ld de, SilphCo10F_ScriptPointers
+	ld a, [wSilphCo10FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSilphCo10CurScript], a
+	ld [wSilphCo10FCurScript], a
 	ret
 
 SilphCo10Script_5a14f:
@@ -34,12 +34,12 @@ SilphCo10Text_5a176:
 	SetEvent EVENT_SILPH_CO_10_UNLOCKED_DOOR
 	ret
 
-SilphCo10ScriptPointers:
+SilphCo10F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo10TextPointers:
+SilphCo10F_TextPointers:
 	dw SilphCo10Text1
 	dw SilphCo10Text2
 	dw SilphCo10Text3
@@ -47,7 +47,6 @@ SilphCo10TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
-SilphCo10TrainerHeaders:
 SilphCo10TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_10F_TRAINER_0
 	db ($3 << 4) ; trainer's view range
diff --git a/scripts/silphco11.asm b/scripts/SilphCo11F.asm
index cb922453..e58dbebe 100755
--- a/scripts/silphco11.asm
+++ b/scripts/SilphCo11F.asm
@@ -1,11 +1,11 @@
-SilphCo11Script:
+SilphCo11F_Script:
 	call SilphCo11Script_62127
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo11TrainerHeaders
-	ld de, SilphCo11ScriptPointers
-	ld a, [wSilphCo11CurScript]
+	ld hl, SilphCo11TrainerHeader0
+	ld de, SilphCo11F_ScriptPointers
+	ld a, [wSilphCo11FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSilphCo11CurScript], a
+	ld [wSilphCo11FCurScript], a
 	ret
 
 SilphCo11Script_62127:
@@ -75,11 +75,11 @@ SilphCo11Script_62185:
 	xor a
 	ld [wJoyIgnore], a
 SilphCo11Script_62189:
-	ld [wSilphCo11CurScript], a
+	ld [wSilphCo11FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-SilphCo11ScriptPointers:
+SilphCo11F_ScriptPointers:
 	dw SilphCo11Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -463,7 +463,7 @@ SilphCo11Script_6246d:
 	predef HideObject
 	ret
 
-SilphCo11TextPointers:
+SilphCo11F_TextPointers:
 	dw SilphCo11Text1
 	dw SilphCo11Text2
 	dw SilphCo11Text3
@@ -475,7 +475,6 @@ SilphCo11TextPointers:
 	dw SilphCo11Text9
 	dw SilphCo11Text10
 
-SilphCo11TrainerHeaders:
 SilphCo11TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_11F_TRAINER_1
 	db ($3 << 4)
diff --git a/scripts/silphco11_2.asm b/scripts/SilphCo11F_2.asm
index bf575de5..bf575de5 100755
--- a/scripts/silphco11_2.asm
+++ b/scripts/SilphCo11F_2.asm
diff --git a/scripts/silphco1.asm b/scripts/SilphCo1F.asm
index c0cb169b..6ccaa29c 100755
--- a/scripts/silphco1.asm
+++ b/scripts/SilphCo1F.asm
@@ -1,4 +1,4 @@
-SilphCo1Script:
+SilphCo1F_Script:
 	call EnableAutoTextBoxDrawing
 	CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
 	ret z
@@ -8,7 +8,7 @@ SilphCo1Script:
 	ld [wMissableObjectIndex], a
 	predef_jump ShowObject
 
-SilphCo1TextPointers:
+SilphCo1F_TextPointers:
 	dw SilphCo1Text1
 
 SilphCo1Text1:
diff --git a/scripts/silphco2.asm b/scripts/SilphCo2F.asm
index 3a5d3650..5fd542cb 100755
--- a/scripts/silphco2.asm
+++ b/scripts/SilphCo2F.asm
@@ -1,11 +1,11 @@
-SilphCo2Script:
+SilphCo2F_Script:
 	call SilphCo2Script_59d07
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo2TrainerHeaders
-	ld de, SilphCo2ScriptPointers
-	ld a, [wSilphCo2CurScript]
+	ld hl, SilphCo2TrainerHeader0
+	ld de, SilphCo2F_ScriptPointers
+	ld a, [wSilphCo2FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSilphCo2CurScript], a
+	ld [wSilphCo2FCurScript], a
 	ret
 
 SilphCo2Script_59d07:
@@ -86,19 +86,18 @@ SilphCo2Script_59d6f:
 	SetEventAfterBranchReuseHL EVENT_SILPH_CO_2_UNLOCKED_DOOR2, EVENT_SILPH_CO_2_UNLOCKED_DOOR1
 	ret
 
-SilphCo2ScriptPointers:
+SilphCo2F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo2TextPointers:
+SilphCo2F_TextPointers:
 	dw SilphCo2Text1
 	dw SilphCo2Text2
 	dw SilphCo2Text3
 	dw SilphCo2Text4
 	dw SilphCo2Text5
 
-SilphCo2TrainerHeaders:
 SilphCo2TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_2F_TRAINER_0
 	db ($3 << 4) ; trainer's view range
@@ -162,7 +161,8 @@ SilphCo2Text_59ded:
 
 ReceivedTM36Text:
 	TX_FAR _ReceivedTM36Text
-	db $0B, "@"
+	TX_SFX_ITEM_1
+	db "@"
 
 TM36ExplanationText:
 	TX_FAR _TM36ExplanationText
diff --git a/scripts/silphco3.asm b/scripts/SilphCo3F.asm
index b8dfb7fb..42b5d611 100755
--- a/scripts/silphco3.asm
+++ b/scripts/SilphCo3F.asm
@@ -1,11 +1,11 @@
-SilphCo3Script:
+SilphCo3F_Script:
 	call SilphCo3Script_59f71
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo3TrainerHeaders
-	ld de, SilphCo3ScriptPointers
-	ld a, [wSilphCo3CurScript]
+	ld hl, SilphCo3TrainerHeader0
+	ld de, SilphCo3F_ScriptPointers
+	ld a, [wSilphCo3FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSilphCo3CurScript], a
+	ld [wSilphCo3FCurScript], a
 	ret
 
 SilphCo3Script_59f71:
@@ -50,18 +50,17 @@ SilphCo3Script_59fad:
 	SetEventAfterBranchReuseHL EVENT_SILPH_CO_3_UNLOCKED_DOOR2, EVENT_SILPH_CO_3_UNLOCKED_DOOR1
 	ret
 
-SilphCo3ScriptPointers:
+SilphCo3F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo3TextPointers:
+SilphCo3F_TextPointers:
 	dw SilphCo3Text1
 	dw SilphCo3Text2
 	dw SilphCo3Text3
 	dw PickUpItemText
 
-SilphCo3TrainerHeaders:
 SilphCo3TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_3F_TRAINER_0
 	db ($2 << 4) ; trainer's view range
diff --git a/scripts/silphco4.asm b/scripts/SilphCo4F.asm
index a0682c8d..7d5072f6 100755
--- a/scripts/silphco4.asm
+++ b/scripts/SilphCo4F.asm
@@ -1,11 +1,11 @@
-SilphCo4Script:
+SilphCo4F_Script:
 	call SilphCo4Script_19d21
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo4TrainerHeaders
-	ld de, SilphCo4ScriptPointers
-	ld a, [wSilphCo4CurScript]
+	ld hl, SilphCo4TrainerHeader0
+	ld de, SilphCo4F_ScriptPointers
+	ld a, [wSilphCo4FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSilphCo4CurScript], a
+	ld [wSilphCo4FCurScript], a
 	ret
 
 SilphCo4Script_19d21:
@@ -86,12 +86,12 @@ SilphCo4Script_19d89:
 	SetEventAfterBranchReuseHL EVENT_SILPH_CO_4_UNLOCKED_DOOR2, EVENT_SILPH_CO_4_UNLOCKED_DOOR1
 	ret
 
-SilphCo4ScriptPointers:
+SilphCo4F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo4TextPointers:
+SilphCo4F_TextPointers:
 	dw SilphCo4Text1
 	dw SilphCo4Text2
 	dw SilphCo4Text3
@@ -100,7 +100,6 @@ SilphCo4TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
-SilphCo4TrainerHeaders:
 SilphCo4TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_0
 	db ($4 << 4) ; trainer's view range
@@ -110,19 +109,19 @@ SilphCo4TrainerHeader0:
 	dw SilphCo4EndBattleText2 ; TextEndBattle
 	dw SilphCo4EndBattleText2 ; TextEndBattle
 
-SilphCo4TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_2
+SilphCo4TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_1
 	dw SilphCo4BattleText3 ; TextBeforeBattle
 	dw SilphCo4AfterBattleText3 ; TextAfterBattle
 	dw SilphCo4EndBattleText3 ; TextEndBattle
 	dw SilphCo4EndBattleText3 ; TextEndBattle
 
-SilphCo4TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_3
+SilphCo4TrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_4F_TRAINER_2
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_4F_TRAINER_2
 	dw SilphCo4BattleText4 ; TextBeforeBattle
 	dw SilphCo4AfterBattleText4 ; TextAfterBattle
 	dw SilphCo4EndBattleText4 ; TextEndBattle
@@ -165,7 +164,7 @@ SilphCo4AfterBattleText2:
 
 SilphCo4Text3:
 	TX_ASM
-	ld hl, SilphCo4TrainerHeader2
+	ld hl, SilphCo4TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -183,7 +182,7 @@ SilphCo4AfterBattleText3:
 
 SilphCo4Text4:
 	TX_ASM
-	ld hl, SilphCo4TrainerHeader3
+	ld hl, SilphCo4TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
diff --git a/scripts/silphco5.asm b/scripts/SilphCo5F.asm
index 42577498..d9deda5b 100755
--- a/scripts/silphco5.asm
+++ b/scripts/SilphCo5F.asm
@@ -1,11 +1,11 @@
-SilphCo5Script:
+SilphCo5F_Script:
 	call SilphCo5Script_19f4d
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo5TrainerHeaders
-	ld de, SilphCo5ScriptPointers
-	ld a, [wSilphCo5CurScript]
+	ld hl, SilphCo5TrainerHeader0
+	ld de, SilphCo5F_ScriptPointers
+	ld a, [wSilphCo5FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSilphCo5CurScript], a
+	ld [wSilphCo5FCurScript], a
 	ret
 
 SilphCo5Script_19f4d:
@@ -65,12 +65,12 @@ SilphCo5Script_19f9e:
 	SetEventAfterBranchReuseHL EVENT_SILPH_CO_5_UNLOCKED_DOOR3, EVENT_SILPH_CO_5_UNLOCKED_DOOR1
 	ret
 
-SilphCo5ScriptPointers:
+SilphCo5F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo5TextPointers:
+SilphCo5F_TextPointers:
 	dw SilphCo5Text1
 	dw SilphCo5Text2
 	dw SilphCo5Text3
@@ -83,8 +83,7 @@ SilphCo5TextPointers:
 	dw SilphCo5Text10
 	dw SilphCo5Text11
 
-SilphCo5TrainerHeaders:
-Silphco5TrainerHeader0:
+SilphCo5TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_0
 	db ($1 << 4) ; trainer's view range
 	dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_0
@@ -93,28 +92,28 @@ Silphco5TrainerHeader0:
 	dw SilphCo5EndBattleText2 ; TextEndBattle
 	dw SilphCo5EndBattleText2 ; TextEndBattle
 
-Silphco5TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_2
+SilphCo5TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_1
 	dw SilphCo5BattleText3 ; TextBeforeBattle
 	dw SilphCo5AfterBattleText3 ; TextAfterBattle
 	dw SilphCo5EndBattleText3 ; TextEndBattle
 	dw SilphCo5EndBattleText3 ; TextEndBattle
 
-Silphco5TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_3
+SilphCo5TrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_2
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_2
 	dw SilphCo5BattleText4 ; TextBeforeBattle
 	dw SilphCo5AfterBattleText4 ; TextAfterBattle
 	dw SilphCo5EndBattleText4 ; TextEndBattle
 	dw SilphCo5EndBattleText4 ; TextEndBattle
 
-Silphco5TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_4
+SilphCo5TrainerHeader3:
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_3
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_3
 	dw SilphCo5BattleText5 ; TextBeforeBattle
 	dw SilphCo5AfterBattleText5 ; TextAfterBattle
 	dw SilphCo5EndBattleText5 ; TextEndBattle
@@ -139,7 +138,7 @@ SilphCo5Text_1a015:
 
 SilphCo5Text2:
 	TX_ASM
-	ld hl, Silphco5TrainerHeader0
+	ld hl, SilphCo5TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -157,7 +156,7 @@ SilphCo5AfterBattleText2:
 
 SilphCo5Text3:
 	TX_ASM
-	ld hl, Silphco5TrainerHeader2
+	ld hl, SilphCo5TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -175,7 +174,7 @@ SilphCo5AfterBattleText3:
 
 SilphCo5Text4:
 	TX_ASM
-	ld hl, Silphco5TrainerHeader3
+	ld hl, SilphCo5TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -193,7 +192,7 @@ SilphCo5AfterBattleText4:
 
 SilphCo5Text5:
 	TX_ASM
-	ld hl, Silphco5TrainerHeader4
+	ld hl, SilphCo5TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
diff --git a/scripts/silphco6.asm b/scripts/SilphCo6F.asm
index c40c7d70..ddbcba79 100755
--- a/scripts/silphco6.asm
+++ b/scripts/SilphCo6F.asm
@@ -1,11 +1,11 @@
-SilphCo6Script:
+SilphCo6F_Script:
 	call SilphCo6Script_1a1bf
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo6TrainerHeaders
-	ld de, SilphCo6ScriptPointers
-	ld a, [wSilphCo6CurScript]
+	ld hl, SilphCo6TrainerHeader0
+	ld de, SilphCo6F_ScriptPointers
+	ld a, [wSilphCo6FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSilphCo6CurScript], a
+	ld [wSilphCo6FCurScript], a
 	ret
 
 SilphCo6Script_1a1bf:
@@ -34,12 +34,12 @@ SilphCo6Script_1a1e6:
 	SetEvent EVENT_SILPH_CO_6_UNLOCKED_DOOR
 	ret
 
-SilphCo6ScriptPointers:
+SilphCo6F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo6TextPointers:
+SilphCo6F_TextPointers:
 	dw SilphCo6Text1
 	dw SilphCo6Text2
 	dw SilphCo6Text3
@@ -51,7 +51,6 @@ SilphCo6TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 
-SilphCo6TrainerHeaders:
 SilphCo6TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_0
 	db ($2 << 4) ; trainer's view range
@@ -61,19 +60,19 @@ SilphCo6TrainerHeader0:
 	dw SilphCo6EndBattleText2 ; TextEndBattle
 	dw SilphCo6EndBattleText2 ; TextEndBattle
 
-SilphCo6TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_2
+SilphCo6TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_1
 	dw SilphCo6BattleText3 ; TextBeforeBattle
 	dw SilphCo6AfterBattleText3 ; TextAfterBattle
 	dw SilphCo6EndBattleText3 ; TextEndBattle
 	dw SilphCo6EndBattleText3 ; TextEndBattle
 
-SilphCo6TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_3, 1
+SilphCo6TrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 1
 	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_3, 1
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 1
 	dw SilphCo6BattleText4 ; TextBeforeBattle
 	dw SilphCo6AfterBattleText4 ; TextAfterBattle
 	dw SilphCo6EndBattleText4 ; TextEndBattle
@@ -186,7 +185,7 @@ SilphCo6AfterBattleText2:
 
 SilphCo6Text7:
 	TX_ASM
-	ld hl, SilphCo6TrainerHeader2
+	ld hl, SilphCo6TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -204,7 +203,7 @@ SilphCo6AfterBattleText3:
 
 SilphCo6Text8:
 	TX_ASM
-	ld hl, SilphCo6TrainerHeader3
+	ld hl, SilphCo6TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
diff --git a/scripts/silphco7.asm b/scripts/SilphCo7F.asm
index 2e93d92a..a8dc032d 100755
--- a/scripts/silphco7.asm
+++ b/scripts/SilphCo7F.asm
@@ -1,11 +1,11 @@
-SilphCo7Script:
+SilphCo7F_Script:
 	call SilphCo7Script_51b77
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo7TrainerHeaders
-	ld de, SilphCo7ScriptPointers
-	ld a, [wSilphCo7CurScript]
+	ld hl, SilphCo7TrainerHeader0
+	ld de, SilphCo7F_ScriptPointers
+	ld a, [wSilphCo7FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSilphCo7CurScript], a
+	ld [wSilphCo7FCurScript], a
 	ret
 
 SilphCo7Script_51b77:
@@ -106,11 +106,11 @@ SilphCo7Text_51c0c:
 	ld [wJoyIgnore], a
 
 SilphCo7Text_51c10:
-	ld [wSilphCo7CurScript], a
+	ld [wSilphCo7FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-SilphCo7ScriptPointers:
+SilphCo7F_ScriptPointers:
 	dw SilphCo7Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -248,7 +248,7 @@ SilphCo7Script5:
 	ld [wJoyIgnore], a
 	jp SilphCo7Text_51c10
 
-SilphCo7TextPointers:
+SilphCo7F_TextPointers:
 	dw SilphCo7Text1
 	dw SilphCo7Text2
 	dw SilphCo7Text3
@@ -265,7 +265,6 @@ SilphCo7TextPointers:
 	dw SilphCo7Text14
 	dw SilphCo7Text15
 
-SilphCo7TrainerHeaders:
 SilphCo7TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_0
 	db ($2 << 4) ; trainer's view range
@@ -275,28 +274,28 @@ SilphCo7TrainerHeader0:
 	dw SilphCo7EndBattleText1 ; TextEndBattle
 	dw SilphCo7EndBattleText1 ; TextEndBattle
 
-SilphCo7TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_2
+SilphCo7TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_1
 	dw SilphCo7BattleText2 ; TextBeforeBattle
 	dw SilphCo7AfterBattleText2 ; TextAfterBattle
 	dw SilphCo7EndBattleText2 ; TextEndBattle
 	dw SilphCo7EndBattleText2 ; TextEndBattle
 
-SilphCo7TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_3
+SilphCo7TrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_2
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_2
 	dw SilphCo7BattleText3 ; TextBeforeBattle
 	dw SilphCo7AfterBattleText3 ; TextAfterBattle
 	dw SilphCo7EndBattleText3 ; TextEndBattle
 	dw SilphCo7EndBattleText3 ; TextEndBattle
 
-SilphCo7TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_4, 1
+SilphCo7TrainerHeader3:
+	dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 1
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_4, 1
+	dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 1
 	dw SilphCo7BattleText4 ; TextBeforeBattle
 	dw SilphCo7AfterBattleText4 ; TextAfterBattle
 	dw SilphCo7EndBattleText4 ; TextEndBattle
@@ -435,7 +434,7 @@ SilphCo7AfterBattleText1:
 
 SilphCo7Text6:
 	TX_ASM
-	ld hl, SilphCo7TrainerHeader2
+	ld hl, SilphCo7TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -453,7 +452,7 @@ SilphCo7AfterBattleText2:
 
 SilphCo7Text7:
 	TX_ASM
-	ld hl, SilphCo7TrainerHeader3
+	ld hl, SilphCo7TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
@@ -471,7 +470,7 @@ SilphCo7AfterBattleText3:
 
 SilphCo7Text8:
 	TX_ASM
-	ld hl, SilphCo7TrainerHeader4
+	ld hl, SilphCo7TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
diff --git a/scripts/silphco8.asm b/scripts/SilphCo8F.asm
index 399f7bd5..ce6579f7 100755
--- a/scripts/silphco8.asm
+++ b/scripts/SilphCo8F.asm
@@ -1,11 +1,11 @@
-SilphCo8Script:
+SilphCo8F_Script:
 	call SilphCo8Script_5651a
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo8TrainerHeader0
-	ld de, SilphCo8ScriptPointers
-	ld a, [wSilphCo8CurScript]
+	ld de, SilphCo8F_ScriptPointers
+	ld a, [wSilphCo8FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSilphCo8CurScript], a
+	ld [wSilphCo8FCurScript], a
 	ret
 
 SilphCo8Script_5651a:
@@ -70,18 +70,17 @@ SilphCo8Script_5656d:
 	SetEvent EVENT_SILPH_CO_8_UNLOCKED_DOOR
 	ret
 
-SilphCo8ScriptPointers:
+SilphCo8F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo8TextPointers:
+SilphCo8F_TextPointers:
 	dw SilphCo8Text1
 	dw SilphCo8Text2
 	dw SilphCo8Text3
 	dw SilphCo8Text4
 
-SilphCo8TrainerHeaders:
 SilphCo8TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_0
 	db ($4 << 4) ; trainer's view range
diff --git a/scripts/silphco9.asm b/scripts/SilphCo9F.asm
index 6757eb49..66291e98 100755
--- a/scripts/silphco9.asm
+++ b/scripts/SilphCo9F.asm
@@ -1,11 +1,11 @@
-SilphCo9Script:
+SilphCo9F_Script:
 	call SilphCo9Script_5d7d1
 	call EnableAutoTextBoxDrawing
-	ld hl, SilphCo9TrainerHeaders
-	ld de, SilphCo9ScriptPointers
-	ld a, [wSilphCo9CurScript]
+	ld hl, SilphCo9TrainerHeader0
+	ld de, SilphCo9F_ScriptPointers
+	ld a, [wSilphCo9FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSilphCo9CurScript], a
+	ld [wSilphCo9FCurScript], a
 	ret
 
 SilphCo9Script_5d7d1:
@@ -118,18 +118,17 @@ SilphCo9Script_5d863:
 	SetEventAfterBranchReuseHL EVENT_SILPH_CO_9_UNLOCKED_DOOR4, EVENT_SILPH_CO_9_UNLOCKED_DOOR1
 	ret
 
-SilphCo9ScriptPointers:
+SilphCo9F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo9TextPointers:
+SilphCo9F_TextPointers:
 	dw SilphCo9Text1
 	dw SilphCo9Text2
 	dw SilphCo9Text3
 	dw SilphCo9Text4
 
-SilphCo9TrainerHeaders:
 SilphCo9TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_SILPH_CO_9F_TRAINER_0
 	db ($4 << 4) ; trainer's view range
diff --git a/scripts/silphcoelevator.asm b/scripts/SilphCoElevator.asm
index df4d08c7..49de6b27 100755
--- a/scripts/silphcoelevator.asm
+++ b/scripts/SilphCoElevator.asm
@@ -1,4 +1,4 @@
-SilphCoElevatorScript:
+SilphCoElevator_Script:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -32,7 +32,7 @@ SilphCoElevatorScript_457ea:
 	ret
 
 SilphCoElevatorScript_457f1:
-	ld hl, SilphCoElavatorFloors
+	ld hl, SilphCoElevatorFloors
 	call LoadItemList
 	ld hl, SilphCoElevatorWarpMaps
 	ld de, wElevatorWarpMaps
@@ -40,7 +40,7 @@ SilphCoElevatorScript_457f1:
 	call CopyData
 	ret
 
-SilphCoElavatorFloors:
+SilphCoElevatorFloors:
 	db $0B ; num elements in list
 	db FLOOR_1F
 	db FLOOR_2F
@@ -77,7 +77,7 @@ SilphCoElevatorScript_45827:
 	callba ShakeElevator
 	ret
 
-SilphCoElevatorTextPointers:
+SilphCoElevator_TextPointers:
 	dw SilphCoElevatorText1
 
 SilphCoElevatorText1:
diff --git a/scripts/tradecenter.asm b/scripts/TradeCenter.asm
index a200e719..ddb3061e 100644
--- a/scripts/tradecenter.asm
+++ b/scripts/TradeCenter.asm
@@ -1,7 +1,7 @@
-TradeCenterScript:
+TradeCenter_Script:
 	call EnableAutoTextBoxDrawing
-	ld a, [$ffaa]
-	cp $2
+	ld a, [hSerialConnectionStatus]
+	cp USING_INTERNAL_CLOCK
 	ld a, SPRITE_FACING_LEFT
 	jr z, .next
 	ld a, SPRITE_FACING_RIGHT
@@ -21,8 +21,8 @@ TradeCenterScript:
 	ld [hl], a
 	ld a, SPRITE_FACING_LEFT
 	ld [wSpriteStateData1 + $19], a
-	ld a, [$ffaa]
-	cp $2
+	ld a, [hSerialConnectionStatus]
+	cp USING_INTERNAL_CLOCK
 	ret z
 	ld a, $7
 	ld [wSpriteStateData2 + $15], a
@@ -30,7 +30,7 @@ TradeCenterScript:
 	ld [wSpriteStateData1 + $19], a
 	ret
 
-TradeCenterTextPointers:
+TradeCenter_TextPointers:
 	dw TradeCenterText1
 
 TradeCenterText1:
diff --git a/scripts/UndergroundPathNorthSouth.asm b/scripts/UndergroundPathNorthSouth.asm
new file mode 100755
index 00000000..52b3d8bf
--- /dev/null
+++ b/scripts/UndergroundPathNorthSouth.asm
@@ -0,0 +1,5 @@
+UndergroundPathNorthSouth_Script:
+	jp EnableAutoTextBoxDrawing
+
+UndergroundPathNorthSouth_TextPointers:
+	db "@"
diff --git a/scripts/undergroundpathentranceroute5.asm b/scripts/UndergroundPathRoute5.asm
index 18707c4a..23d72569 100755
--- a/scripts/undergroundpathentranceroute5.asm
+++ b/scripts/UndergroundPathRoute5.asm
@@ -1,4 +1,4 @@
-UndergroundPathEntranceRoute5Script:
+UndergroundPathRoute5_Script:
 	ld a, ROUTE_5
 	ld [wLastMap], a
 	ret
@@ -6,7 +6,7 @@ UndergroundPathEntranceRoute5Script:
 UndergroundPathEntranceRoute5_5d6af:
 	db "@"
 
-UndergroundPathEntranceRoute5TextPointers:
+UndergroundPathRoute5_TextPointers:
 	dw UndergroundPathEntranceRoute5Text1
 
 UndergroundPathEntranceRoute5Text1:
diff --git a/scripts/undergroundpathentranceroute6.asm b/scripts/UndergroundPathRoute6.asm
index c6dfdcc9..0a690518 100755
--- a/scripts/undergroundpathentranceroute6.asm
+++ b/scripts/UndergroundPathRoute6.asm
@@ -1,9 +1,9 @@
-UndergroundPathEntranceRoute6Script:
+UndergroundPathRoute6_Script:
 	ld a, ROUTE_6
 	ld [wLastMap], a
 	jp EnableAutoTextBoxDrawing
 
-UndergroundPathEntranceRoute6TextPointers:
+UndergroundPathRoute6_TextPointers:
 	dw UndergroundPathEntranceRoute6Text1
 
 UndergroundPathEntranceRoute6Text1:
diff --git a/scripts/undergroundpathentranceroute7.asm b/scripts/UndergroundPathRoute7.asm
index 84c8e4d5..3a1f14c7 100755
--- a/scripts/undergroundpathentranceroute7.asm
+++ b/scripts/UndergroundPathRoute7.asm
@@ -1,9 +1,9 @@
-UndergroundPathEntranceRoute7Script:
+UndergroundPathRoute7_Script:
 	ld a, ROUTE_7
 	ld [wLastMap], a
 	jp EnableAutoTextBoxDrawing
 
-UndergroundPathEntranceRoute7TextPointers:
+UndergroundPathRoute7_TextPointers:
 	dw UndergroundPathEntranceRoute7Text1
 
 UndergroundPathEntranceRoute7Text1:
diff --git a/scripts/undergroundpathentranceroute7copy.asm b/scripts/UndergroundPathRoute7Copy.asm
index c623eeec..8a494caf 100755
--- a/scripts/undergroundpathentranceroute7copy.asm
+++ b/scripts/UndergroundPathRoute7Copy.asm
@@ -1,9 +1,9 @@
-UndergroundPathEntranceRoute7CopyScript:
+UndergroundPathRoute7Copy_Script:
 	ld a, ROUTE_7
 	ld [wLastMap], a
 	ret
 
-UndergroundPathEntranceRoute7CopyTextPointers:
+UndergroundPathRoute7Copy_TextPointers:
 	dw UGPathRoute7EntranceUnusedText_5d773
 	dw UGPathRoute7EntranceUnusedText_5d77d
 
diff --git a/scripts/undergroundpathentranceroute8.asm b/scripts/UndergroundPathRoute8.asm
index ad0b60ab..ab0a9977 100755
--- a/scripts/undergroundpathentranceroute8.asm
+++ b/scripts/UndergroundPathRoute8.asm
@@ -1,9 +1,9 @@
-UndergroundPathEntranceRoute8Script:
+UndergroundPathRoute8_Script:
 	ld a, ROUTE_8
 	ld [wLastMap], a
 	jp EnableAutoTextBoxDrawing
 
-UndergroundPathEntranceRoute8TextPointers:
+UndergroundPathRoute8_TextPointers:
 	dw UndergroundPathEntranceRoute8Text1
 
 UndergroundPathEntranceRoute8Text1:
diff --git a/scripts/UndergroundPathWestEast.asm b/scripts/UndergroundPathWestEast.asm
new file mode 100755
index 00000000..cb1a7bd8
--- /dev/null
+++ b/scripts/UndergroundPathWestEast.asm
@@ -0,0 +1,5 @@
+UndergroundPathWestEast_Script:
+	jp EnableAutoTextBoxDrawing
+
+UndergroundPathWestEast_TextPointers:
+	db "@"
diff --git a/scripts/vermilioncity.asm b/scripts/VermilionCity.asm
index 7127f814..a9336970 100755
--- a/scripts/vermilioncity.asm
+++ b/scripts/VermilionCity.asm
@@ -1,4 +1,4 @@
-VermilionCityScript:
+VermilionCity_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, wd492
 	res 7, [hl]
@@ -6,18 +6,18 @@ VermilionCityScript:
 	bit 6, [hl]
 	res 6, [hl]
 	push hl
-	call nz, InitCityScript
+	call nz, .initCityScript
 	pop hl
 	bit 5, [hl]
 	res 5, [hl]
-	call nz, SetFirstLockTrashCanIndex
-	ld hl, VermilionCityScriptPointers
+	call nz, .setFirstLockTrashCanIndex
+	ld hl, VermilionCity_ScriptPointers
 	ld a, [wVermilionCityCurScript]
-	call JumpTable
-	call VermilionCityScript_19869
+	call CallFunctionInTable
+	call .vermilionCityScript_19869
 	ret
 
-VermilionCityScript_19869:
+.vermilionCityScript_19869
 	CheckEventHL EVENT_152
 	ret nz
 	CheckEventReuseHL EVENT_GOT_BIKE_VOUCHER
@@ -25,7 +25,7 @@ VermilionCityScript_19869:
 	SetEventReuseHL EVENT_152
 	ret
 
-SetFirstLockTrashCanIndex:
+.setFirstLockTrashCanIndex
 	call Random
 	ld a, [hRandomAdd]
 	ld b, a
@@ -35,7 +35,7 @@ SetFirstLockTrashCanIndex:
 	ld [wFirstLockTrashCanIndex], a
 	ret
 
-InitCityScript:
+.initCityScript
 	CheckEventHL EVENT_SS_ANNE_LEFT
 	ret z
 	CheckEventReuseHL EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT
@@ -45,7 +45,7 @@ InitCityScript:
 	ld [wVermilionCityCurScript], a
 	ret
 
-VermilionCityScriptPointers:
+VermilionCity_ScriptPointers:
 	dw VermilionCityScript0
 	dw VermilionCityScript1
 	dw VermilionCityScript2
@@ -131,7 +131,7 @@ VermilionCityScript1:
 	ld [wVermilionCityCurScript], a
 	ret
 
-VermilionCityTextPointers:
+VermilionCity_TextPointers:
 	dw VermilionCityText1
 	dw VermilionCityText2
 	dw VermilionCityText3
@@ -209,7 +209,7 @@ VermilionCityText3:
 .end
 	jp TextScriptEnd
 
-.inFrontOfOrBehindGuardCoords:
+.inFrontOfOrBehindGuardCoords
 	db $1d,$13 ; y, x of tile in front of guard
 	db $1f,$13 ; y, x of tile behind guard
 	db $ff
diff --git a/scripts/vermilioncity2.asm b/scripts/VermilionCity2.asm
index eb7ea37a..eb7ea37a 100755
--- a/scripts/vermilioncity2.asm
+++ b/scripts/VermilionCity2.asm
diff --git a/scripts/vermiliondock.asm b/scripts/VermilionDock.asm
index e1378db3..f5807dd4 100755
--- a/scripts/vermiliondock.asm
+++ b/scripts/VermilionDock.asm
@@ -1,4 +1,4 @@
-VermilionDockScript:
+VermilionDock_Script:
 	call EnableAutoTextBoxDrawing
 	CheckEventHL EVENT_STARTED_WALKING_OUT_OF_DOCK
 	jr nz, .asm_1db8d
@@ -207,7 +207,7 @@ VermilionDock_EraseSSAnne:
 	call DelayFrames
 	ret
 
-VermilionDockTextPointers:
+VermilionDock_TextPointers:
 	dw VermilionDockText1
 
 VermilionDockText1:
diff --git a/scripts/vermiliongym.asm b/scripts/VermilionGym.asm
index 90ffc34c..0af37945 100755
--- a/scripts/vermiliongym.asm
+++ b/scripts/VermilionGym.asm
@@ -1,22 +1,22 @@
-VermilionGymScript:
+VermilionGym_Script:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	push hl
-	call nz, VermilionGymScript_5ca4c
+	call nz, VermilionGymLoadName
 	pop hl
 	bit 6, [hl]
 	res 6, [hl]
-	call nz, VermilionGymScript_5ca6d
+	call nz, VermilionGymSetDoorTile
 	call EnableAutoTextBoxDrawing
 	ld hl, VermilionGymTrainerHeader0
-	ld de, VermilionGymScriptPointers
+	ld de, VermilionGym_ScriptPointers
 	ld a, [wVermilionGymCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wVermilionGymCurScript], a
 	ret
 
-VermilionGymScript_5ca4c:
+VermilionGymLoadName:
 	ld hl, Gym3CityName
 	ld de, Gym3LeaderName
 	jp LoadGymLeaderAndCityName
@@ -27,42 +27,41 @@ Gym3CityName:
 Gym3LeaderName:
 	db "LT.SURGE@"
 
-VermilionGymScript_5ca6d:
+VermilionGymSetDoorTile:
 	CheckEvent EVENT_2ND_LOCK_OPENED
-	jr nz, .opened_second_lock
-	ld a, $24
-	jr .load_door_tile
-
-.opened_second_lock
+	jr nz, .doorsOpen
+	ld a, $24 ; double door tile ID
+	jr .replaceTile
+.doorsOpen
 	ld a, SFX_GO_INSIDE
 	call PlaySound
-	ld a, $5
-.load_door_tile
+	ld a, $5 ; clear floor tile ID
+.replaceTile
 	ld [wNewTileBlockID], a
 	lb bc, 2, 2
 	predef_jump ReplaceTileBlock
 
-VermilionGymScript_5ca8a:
+VermilionGymResetScripts:
 	xor a
 	ld [wJoyIgnore], a
 	ld [wVermilionGymCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-VermilionGymScriptPointers:
+VermilionGym_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
-	dw VermilionGymScript3
+	dw VermilionGymLTSurgePostBattle
 
-VermilionGymScript3:
+VermilionGymLTSurgePostBattle:
 	ld a, [wIsInBattle]
-	cp $ff
-	jp z, VermilionGymScript_5ca8a
-	ld a, $f0
+	cp $ff ; did we lose?
+	jp z, VermilionGymResetScripts
+	ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
 	ld [wJoyIgnore], a
 
-VermilionGymScript_5caaa:
+VermilionGymReceiveTM24:
 	ld a, $6
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -74,13 +73,12 @@ VermilionGymScript_5caaa:
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	SetEvent EVENT_GOT_TM24
-	jr .set_gym_flags
-
+	jr .gymVictory
 .BagFull
 	ld a, $8
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
-.set_gym_flags
+.gymVictory
 	ld hl, wObtainedBadges
 	set 2, [hl]
 	ld hl, wBeatGymFlags
@@ -89,19 +87,18 @@ VermilionGymScript_5caaa:
 	; deactivate gym trainers
 	SetEventRange EVENT_BEAT_VERMILION_GYM_TRAINER_0, EVENT_BEAT_VERMILION_GYM_TRAINER_2
 
-	jp VermilionGymScript_5ca8a
+	jp VermilionGymResetScripts
 
-VermilionGymTextPointers:
-	dw VermilionGymText1
-	dw VermilionGymText2
-	dw VermilionGymText3
-	dw VermilionGymText4
-	dw VermilionGymText5
-	dw VermilionGymText6
-	dw VermilionGymText7
-	dw VermilionGymText8
+VermilionGym_TextPointers:
+	dw LTSurgeText
+	dw VermilionGymTrainerText1
+	dw VermilionGymTrainerText2
+	dw VermilionGymTrainerText3
+	dw VermilionGymFanText
+	dw LTSurgeThunderbadgeInfoText
+	dw ReceivedTM24Text
+	dw TM24NoRoomText
 
-VermilionGymTrainerHeaders:
 VermilionGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_VERMILION_GYM_TRAINER_0
 	db ($3 << 4) ; trainer's view range
@@ -131,23 +128,21 @@ VermilionGymTrainerHeader2:
 
 	db $ff
 
-VermilionGymText1:
+LTSurgeText:
 	TX_ASM
 	CheckEvent EVENT_BEAT_LT_SURGE
-	jr z, .engage_surge
+	jr z, .beforeBeat
 	CheckEventReuseA EVENT_GOT_TM24
-	jr nz, .after_win_text
-	call z, VermilionGymScript_5caaa
+	jr nz, .afterBeat
+	call z, VermilionGymReceiveTM24
 	call DisableWaitingAfterTextDisplay
-	jr .text_script_end
-
-.after_win_text
-	ld hl, VermilionGymText_5cb72
+	jr .done
+.afterBeat
+	ld hl, LTSurgePostBattleAdviceText
 	call PrintText
-	jr .text_script_end
-
-.engage_surge
-	ld hl, VermilionGymText_5cb6d
+	jr .done
+.beforeBeat
+	ld hl, LTSurgePreBattleText
 	call PrintText
 	ld hl, wd72d
 	set 6, [hl]
@@ -163,31 +158,31 @@ VermilionGymText1:
 	ld [wGymLeaderNo], a
 	xor a
 	ld [hJoyHeld], a
-	ld a, $3
+	ld a, $3 ; set script index to LT Surge post-battle script
 	ld [wVermilionGymCurScript], a
 	ld [wCurMapScript], a
-.text_script_end
+.done
 	jp TextScriptEnd
 
-VermilionGymText_5cb6d:
-	TX_FAR _VermilionGymText_5cb6d
+LTSurgePreBattleText:
+	TX_FAR _LTSurgePreBattleText
 	db "@"
 
-VermilionGymText_5cb72:
-	TX_FAR _VermilionGymText_5cb72
+LTSurgePostBattleAdviceText:
+	TX_FAR _LTSurgePostBattleAdviceText
 	db "@"
 
-VermilionGymText6:
-	TX_FAR _VermilionGymText_5cb77
+LTSurgeThunderbadgeInfoText:
+	TX_FAR _LTSurgeThunderbadgeInfoText
 	db "@"
 
-VermilionGymText7:
+ReceivedTM24Text:
 	TX_FAR _ReceivedTM24Text
 	TX_SFX_KEY_ITEM
 	TX_FAR _TM24ExplanationText
 	db "@"
 
-VermilionGymText8:
+TM24NoRoomText:
 	TX_FAR _TM24NoRoomText
 	db "@"
 
@@ -195,7 +190,7 @@ ReceivedThunderbadgeText:
 	TX_FAR _ReceivedThunderbadgeText
 	db "@"
 
-VermilionGymText2:
+VermilionGymTrainerText1:
 	TX_ASM
 	ld hl, VermilionGymTrainerHeader0
 	call TalkToTrainer
@@ -213,7 +208,7 @@ VermilionGymAfterBattleText1:
 	TX_FAR _VermilionGymAfterBattleText1
 	db "@"
 
-VermilionGymText3:
+VermilionGymTrainerText2:
 	TX_ASM
 	ld hl, VermilionGymTrainerHeader1
 	call TalkToTrainer
@@ -231,7 +226,7 @@ VermilionGymAfterBattleText2:
 	TX_FAR _VermilionGymAfterBattleText2
 	db "@"
 
-VermilionGymText4:
+VermilionGymTrainerText3:
 	TX_ASM
 	ld hl, VermilionGymTrainerHeader2
 	call TalkToTrainer
@@ -249,25 +244,24 @@ VermilionGymAfterBattleText3:
 	TX_FAR _VermilionGymAfterBattleText3
 	db "@"
 
-VermilionGymText5:
+VermilionGymFanText:
 	TX_ASM
 	ld a, [wBeatGymFlags]
 	bit 2, a
-	jr nz, .beat_surge
-	ld hl, VermilionGymText_5cbf4
+	jr nz, .afterBeat
+	ld hl, VermilionGymFanPreBattleText
 	call PrintText
-	jr .text_script_end
-
-.beat_surge
-	ld hl, VermilionGymText_5cbf9
+	jr .done
+.afterBeat
+	ld hl, VermilionGymFanPostBattleText
 	call PrintText
-.text_script_end
+.done
 	jp TextScriptEnd
 
-VermilionGymText_5cbf4:
-	TX_FAR _VermilionGymText_5cbf4
+VermilionGymFanPreBattleText:
+	TX_FAR _VermilionGymFanPreBattleText
 	db "@"
 
-VermilionGymText_5cbf9:
-	TX_FAR _VermilionGymText_5cbf9
+VermilionGymFanPostBattleText:
+	TX_FAR _VermilionGymFanPostBattleText
 	db "@"
diff --git a/scripts/vermilionmart.asm b/scripts/VermilionMart.asm
index 2d4df78d..00ba0c26 100755
--- a/scripts/vermilionmart.asm
+++ b/scripts/VermilionMart.asm
@@ -1,7 +1,7 @@
-VermilionMartScript:
+VermilionMart_Script:
 	jp EnableAutoTextBoxDrawing
 
-VermilionMartTextPointers:
+VermilionMart_TextPointers:
 	dw VermilionCashierText
 	dw VermilionMartText2
 	dw VermilionMartText3
diff --git a/scripts/vermilionhouse2.asm b/scripts/VermilionOldRodHouse.asm
index 007df5ec..772158ff 100755
--- a/scripts/vermilionhouse2.asm
+++ b/scripts/VermilionOldRodHouse.asm
@@ -1,7 +1,7 @@
-VermilionHouse2Script:
+VermilionOldRodHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-VermilionHouse2TextPointers:
+VermilionOldRodHouse_TextPointers:
 	dw VermilionHouse2Text1
 
 VermilionHouse2Text1:
@@ -40,7 +40,7 @@ VermilionHouse2Text_560b1:
 
 VermilionHouse2Text_560b6:
 	TX_FAR _VermilionHouse2Text_560b6
-	db $0B
+	TX_SFX_ITEM_1
 	TX_FAR _VermilionHouse2Text_560bb
 	db "@"
 
diff --git a/scripts/vermilionhouse1.asm b/scripts/VermilionPidgeyHouse.asm
index d2dac4ca..5004d367 100755
--- a/scripts/vermilionhouse1.asm
+++ b/scripts/VermilionPidgeyHouse.asm
@@ -1,8 +1,8 @@
-VermilionHouse1Script:
+VermilionPidgeyHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-VermilionHouse1TextPointers:
+VermilionPidgeyHouse_TextPointers:
 	dw VermilionHouse1Text1
 	dw VermilionHouse1Text2
 	dw VermilionHouse1Text3
diff --git a/scripts/vermilionpokecenter.asm b/scripts/VermilionPokecenter.asm
index af481a16..e470b028 100755
--- a/scripts/vermilionpokecenter.asm
+++ b/scripts/VermilionPokecenter.asm
@@ -1,8 +1,8 @@
-VermilionPokecenterScript:
+VermilionPokecenter_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-VermilionPokecenterTextPointers:
+VermilionPokecenter_TextPointers:
 	dw VermilionHealNurseText
 	dw VermilionPokecenterText2
 	dw VermilionPokecenterText3
diff --git a/scripts/vermilionhouse3.asm b/scripts/VermilionTradeHouse.asm
index aeada0d0..7f720364 100755
--- a/scripts/vermilionhouse3.asm
+++ b/scripts/VermilionTradeHouse.asm
@@ -1,7 +1,7 @@
-VermilionHouse3Script:
+VermilionTradeHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-VermilionHouse3TextPointers:
+VermilionTradeHouse_TextPointers:
 	dw VermilionHouse3Text1
 
 VermilionHouse3Text1:
diff --git a/scripts/victoryroad1.asm b/scripts/VictoryRoad1F.asm
index 0f4de43e..07f203b1 100755
--- a/scripts/victoryroad1.asm
+++ b/scripts/VictoryRoad1F.asm
@@ -1,14 +1,14 @@
-VictoryRoad1Script:
+VictoryRoad1F_Script:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	call nz, .next
 	call EnableAutoTextBoxDrawing
-	ld hl, VictoryRoad1TrainerHeaders
-	ld de, VictoryRoad1ScriptPointers
-	ld a, [wVictoryRoad1CurScript]
+	ld hl, VictoryRoad1TrainerHeader0
+	ld de, VictoryRoad1F_ScriptPointers
+	ld a, [wVictoryRoad1FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wVictoryRoad1CurScript], a
+	ld [wVictoryRoad1FCurScript], a
 	ret
 .next
 	CheckEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH
@@ -18,7 +18,7 @@ VictoryRoad1Script:
 	lb bc, 6, 4
 	predef_jump ReplaceTileBlock
 
-VictoryRoad1ScriptPointers:
+VictoryRoad1F_ScriptPointers:
 	dw VictoryRoad1Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -40,7 +40,7 @@ VictoryRoad1Script0:
 CoordsData_5da5c:
 	db $0D,$11,$FF
 
-VictoryRoad1TextPointers:
+VictoryRoad1F_TextPointers:
 	dw VictoryRoad1Text1
 	dw VictoryRoad1Text2
 	dw PickUpItemText
@@ -49,7 +49,6 @@ VictoryRoad1TextPointers:
 	dw BoulderText
 	dw BoulderText
 
-VictoryRoad1TrainerHeaders:
 VictoryRoad1TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0
 	db ($2 << 4) ; trainer's view range
diff --git a/scripts/victoryroad2.asm b/scripts/VictoryRoad2F.asm
index 20a80461..a09e6f04 100755
--- a/scripts/victoryroad2.asm
+++ b/scripts/VictoryRoad2F.asm
@@ -1,4 +1,4 @@
-VictoryRoad2Script:
+VictoryRoad2F_Script:
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
@@ -8,11 +8,11 @@ VictoryRoad2Script:
 	res 5, [hl]
 	call nz, VictoryRoad2Script_517c9
 	call EnableAutoTextBoxDrawing
-	ld hl, VictoryRoad2TrainerHeaders
-	ld de, VictoryRoad2ScriptPointers
-	ld a, [wVictoryRoad2CurScript]
+	ld hl, VictoryRoad2TrainerHeader0
+	ld de, VictoryRoad2F_ScriptPointers
+	ld a, [wVictoryRoad2FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wVictoryRoad2CurScript], a
+	ld [wVictoryRoad2FCurScript], a
 	ret
 
 VictoryRoad2Script_517c4:
@@ -35,7 +35,7 @@ VictoryRoad2Script_517e2:
 	predef ReplaceTileBlock
 	ret
 
-VictoryRoad2ScriptPointers:
+VictoryRoad2F_ScriptPointers:
 	dw VictoryRoad2Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -69,7 +69,7 @@ CoordsData_51816:
 	db $10,$09
 	db $FF
 
-VictoryRoad2TextPointers:
+VictoryRoad2F_TextPointers:
 	dw VictoryRoad2Text1
 	dw VictoryRoad2Text2
 	dw VictoryRoad2Text3
@@ -84,7 +84,6 @@ VictoryRoad2TextPointers:
 	dw BoulderText
 	dw BoulderText
 
-VictoryRoad2TrainerHeaders:
 VictoryRoad2TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_0
 	db ($4 << 4) ; trainer's view range
@@ -94,37 +93,37 @@ VictoryRoad2TrainerHeader0:
 	dw VictoryRoad2EndBattleText1 ; TextEndBattle
 	dw VictoryRoad2EndBattleText1 ; TextEndBattle
 
-VictoryRoad2TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2
+VictoryRoad2TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_1
 	dw VictoryRoad2BattleText2 ; TextBeforeBattle
 	dw VictoryRoad2AfterBattleText2 ; TextAfterBattle
 	dw VictoryRoad2EndBattleText2 ; TextEndBattle
 	dw VictoryRoad2EndBattleText2 ; TextEndBattle
 
-VictoryRoad2TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3
+VictoryRoad2TrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2
 	dw VictoryRoad2BattleText3 ; TextBeforeBattle
 	dw VictoryRoad2AfterBattleText3 ; TextAfterBattle
 	dw VictoryRoad2EndBattleText3 ; TextEndBattle
 	dw VictoryRoad2EndBattleText3 ; TextEndBattle
 
-VictoryRoad2TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4
+VictoryRoad2TrainerHeader3:
+	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3
 	db ($1 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3
 	dw VictoryRoad2BattleText4 ; TextBeforeBattle
 	dw VictoryRoad2AfterBattleText4 ; TextAfterBattle
 	dw VictoryRoad2EndBattleText4 ; TextEndBattle
 	dw VictoryRoad2EndBattleText4 ; TextEndBattle
 
-VictoryRoad2TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5
+VictoryRoad2TrainerHeader4:
+	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4
 	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_5
+	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4
 	dw VictoryRoad2BattleText5 ; TextBeforeBattle
 	dw VictoryRoad2AfterBattleText5 ; TextAfterBattle
 	dw VictoryRoad2EndBattleText5 ; TextEndBattle
@@ -149,25 +148,25 @@ VictoryRoad2Text1:
 
 VictoryRoad2Text2:
 	TX_ASM
-	ld hl, VictoryRoad2TrainerHeader2
+	ld hl, VictoryRoad2TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 VictoryRoad2Text3:
 	TX_ASM
-	ld hl, VictoryRoad2TrainerHeader3
+	ld hl, VictoryRoad2TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 VictoryRoad2Text4:
 	TX_ASM
-	ld hl, VictoryRoad2TrainerHeader4
+	ld hl, VictoryRoad2TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
 VictoryRoad2Text5:
 	TX_ASM
-	ld hl, VictoryRoad2TrainerHeader5
+	ld hl, VictoryRoad2TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
diff --git a/scripts/victoryroad3.asm b/scripts/VictoryRoad3F.asm
index 31e06053..dc7a2aac 100755
--- a/scripts/victoryroad3.asm
+++ b/scripts/VictoryRoad3F.asm
@@ -1,11 +1,11 @@
-VictoryRoad3Script:
+VictoryRoad3F_Script:
 	call VictoryRoad3Script_44996
 	call EnableAutoTextBoxDrawing
-	ld hl, VictoryRoad3TrainerHeaders
-	ld de, VictoryRoad3ScriptPointers
-	ld a, [wVictoryRoad3CurScript]
+	ld hl, VictoryRoad3TrainerHeader0
+	ld de, VictoryRoad3F_ScriptPointers
+	ld a, [wVictoryRoad3FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wVictoryRoad3CurScript], a
+	ld [wVictoryRoad3FCurScript], a
 	ret
 
 VictoryRoad3Script_44996:
@@ -20,7 +20,7 @@ VictoryRoad3Script_44996:
 	lb bc, 5, 3
 	predef_jump ReplaceTileBlock
 
-VictoryRoad3ScriptPointers:
+VictoryRoad3F_ScriptPointers:
 	dw VictoryRoad3Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -46,10 +46,10 @@ VictoryRoad3Script0:
 .asm_449dc
 	CheckAndSetEvent EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2
 	jr nz, .asm_449fe
-	ld a, HS_VICTORY_ROAD_3_BOULDER
+	ld a, HS_VICTORY_ROAD_3F_BOULDER
 	ld [wMissableObjectIndex], a
 	predef HideObject
-	ld a, HS_VICTORY_ROAD_2_BOULDER
+	ld a, HS_VICTORY_ROAD_2F_BOULDER
 	ld [wMissableObjectIndex], a
 	predef_jump ShowObject
 
@@ -59,7 +59,7 @@ VictoryRoad3Script0:
 	db $FF
 
 .asm_449fe
-	ld a, VICTORY_ROAD_2
+	ld a, VICTORY_ROAD_2F
 	ld [wDungeonWarpDestinationMap], a
 	ld hl, .coordsData_449f9
 	call IsPlayerOnDungeonWarp
@@ -77,7 +77,7 @@ VictoryRoad3Script0:
 	jp z, CheckFightingMapTrainers
 	ret
 
-VictoryRoad3TextPointers:
+VictoryRoad3F_TextPointers:
 	dw VictoryRoad3Text1
 	dw VictoryRoad3Text2
 	dw VictoryRoad3Text3
@@ -89,7 +89,6 @@ VictoryRoad3TextPointers:
 	dw BoulderText
 	dw BoulderText
 
-VictoryRoad3TrainerHeaders:
 VictoryRoad3TrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_0
 	db ($1 << 4) ; trainer's view range
@@ -99,28 +98,28 @@ VictoryRoad3TrainerHeader0:
 	dw VictoryRoad3EndBattleText2 ; TextEndBattle
 	dw VictoryRoad3EndBattleText2 ; TextEndBattle
 
-VictoryRoad3TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2
+VictoryRoad3TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2
+	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_1
 	dw VictoryRoad3BattleText3 ; TextBeforeBattle
 	dw VictoryRoad3AfterBattleText3 ; TextAfterBattle
 	dw VictoryRoad3EndBattleText3 ; TextEndBattle
 	dw VictoryRoad3EndBattleText3 ; TextEndBattle
 
-VictoryRoad3TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3
+VictoryRoad3TrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3
+	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_2
 	dw VictoryRoad3BattleText4 ; TextBeforeBattle
 	dw VictoryRoad3AfterBattleText4 ; TextAfterBattle
 	dw VictoryRoad3EndBattleText4 ; TextEndBattle
 	dw VictoryRoad3EndBattleText4 ; TextEndBattle
 
-VictoryRoad3TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4
+VictoryRoad3TrainerHeader3:
+	dbEventFlagBit EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3
 	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_4
+	dwEventFlagAddress EVENT_BEAT_VICTORY_ROAD_3_TRAINER_3
 	dw VictoryRoad3BattleText5 ; TextBeforeBattle
 	dw VictoryRoad3AfterBattleText5 ; TextAfterBattle
 	dw VictoryRoad3EndBattleText5 ; TextEndBattle
@@ -136,19 +135,19 @@ VictoryRoad3Text1:
 
 VictoryRoad3Text2:
 	TX_ASM
-	ld hl, VictoryRoad3TrainerHeader2
+	ld hl, VictoryRoad3TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 VictoryRoad3Text3:
 	TX_ASM
-	ld hl, VictoryRoad3TrainerHeader3
+	ld hl, VictoryRoad3TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 VictoryRoad3Text4:
 	TX_ASM
-	ld hl, VictoryRoad3TrainerHeader4
+	ld hl, VictoryRoad3TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
diff --git a/scripts/viridiancity.asm b/scripts/ViridianCity.asm
index f7b7b97f..6dc68d4f 100755
--- a/scripts/viridiancity.asm
+++ b/scripts/ViridianCity.asm
@@ -1,11 +1,11 @@
-ViridianCityScript:
+ViridianCity_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, ViridianCityScriptPointers
+	ld hl, ViridianCity_ScriptPointers
 	ld a, [wViridianCityCurScript]
-	call JumpTable
+	call CallFunctionInTable
 	ret
 
-ViridianCityScriptPointers:
+ViridianCity_ScriptPointers:
 	dw ViridianCityScript0
 	dw ViridianCityScript1
 	dw ViridianCityScript2
@@ -33,12 +33,11 @@ ViridianCityScript_1905b:
 	CheckEvent EVENT_VIRIDIAN_GYM_OPEN
 	ret nz
 	ld a, [wObtainedBadges]
-	cp $7f ; all but Earthbadge
-	jr nz, .asm_1906e
+	cp %01111111
+	jr nz, .gymClosed
 	SetEvent EVENT_VIRIDIAN_GYM_OPEN
 	ret
-
-.asm_1906e
+.gymClosed
 	ld a, [wYCoord]
 	cp 8
 	ret nz
@@ -255,7 +254,7 @@ ViridianCityScript10:
 	ld [wViridianCityCurScript], a
 	ret
 
-ViridianCityTextPointers:
+ViridianCity_TextPointers:
 	dw ViridianCityText_0
 	dw ViridianCityText_1
 	dw ViridianCityText_2
diff --git a/scripts/viridiancity2.asm b/scripts/ViridianCity2.asm
index 532d57d7..ffaeb4e2 100755
--- a/scripts/viridiancity2.asm
+++ b/scripts/ViridianCity2.asm
@@ -10,12 +10,12 @@ ViridianCityText_f18c2:
 Func_f18c7:
 	ld hl, ViridianCityText_f18e4
 	ld a, [wObtainedBadges]
-	cp $7f ; all but EARTHBADGE
-	jr z, .asm_f18db
+	cp %01111111
+	jr z, .printAndDone
 	CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
-	jr nz, .asm_f18db
+	jr nz, .printAndDone
 	ld hl, ViridianCityText_f18df
-.asm_f18db
+.printAndDone
 	call PrintText
 	ret
 
@@ -34,9 +34,9 @@ Func_f18e9:
 	ld a, [wCurrentMenuItem]
 	and a
 	ld hl, ViridianCityText_f1907
-	jr nz, .asm_f18fe
+	jr nz, .no
 	ld hl, ViridianCityText_f190c
-.asm_f18fe
+.no
 	call PrintText
 	ret
 
@@ -55,9 +55,9 @@ ViridianCityText_f190c:
 Func_f1911:
 	ld hl, ViridianCityText_f1927
 	CheckEvent EVENT_GOT_POKEDEX
-	jr nz, .asm_f191e
+	jr nz, .gotPokedex
 	ld hl, ViridianCityText_f1922
-.asm_f191e
+.gotPokedex
 	call PrintText
 	ret
 
@@ -87,23 +87,21 @@ ViridianCityText_f1945:
 
 Func_f194a:
 	CheckEvent EVENT_GOT_TM42
-	jr nz, .asm_f1972
+	jr nz, .gotTm42
 	ld hl, ViridianCityText_f1979
 	call PrintText
 	lb bc, TM_42, 1
 	call GiveItem
-	jr nc, .asm_f196b
+	jr nc, .BagFull
 	ld hl, ViridianCityText_f197e
 	call PrintText
 	SetEvent EVENT_GOT_TM42
 	ret
-
-.asm_f196b
+.BagFull
 	ld hl, ViridianCityText_f1989
 	call PrintText
 	ret
-
-.asm_f1972
+.gotTm42
 	ld hl, ViridianCityText_f1984
 	call PrintText
 	ret
@@ -114,7 +112,7 @@ ViridianCityText_f1979:
 
 ViridianCityText_f197e:
 	TX_FAR _ReceivedTM42Text
-	TX_SFX_CONGRATS
+	TX_SFX_ITEM_2
 	db "@"
 
 ViridianCityText_f1984:
@@ -133,17 +131,16 @@ Func_f198e:
 	call YesNoChoice
 	ld a, [wCurrentMenuItem]
 	and a
-	jr nz, .asm_f19af
+	jr nz, .hurry
 	ld hl, ViridianCityText_f19bb
 	call PrintText
 	ld a, $3
 	ld [wViridianCityCurScript], a
-	jr .asm_f19b5
-
-.asm_f19af
+	jr .done
+.hurry
 	ld hl, ViridianCityText_f19c0
 	call PrintText
-.asm_f19b5
+.done
 	ret
 
 ViridianCityText_f19b6:
diff --git a/scripts/viridianforest.asm b/scripts/ViridianForest.asm
index b1b2f951..fb9a71e3 100755
--- a/scripts/viridianforest.asm
+++ b/scripts/ViridianForest.asm
@@ -1,18 +1,18 @@
-ViridianForestScript:
+ViridianForest_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, ViridianForestTrainerHeaders
-	ld de, ViridianForestScriptPointers
+	ld hl, ViridianForestTrainerHeader0
+	ld de, ViridianForest_ScriptPointers
 	ld a, [wViridianForestCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wViridianForestCurScript], a
 	ret
 
-ViridianForestScriptPointers:
+ViridianForest_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-ViridianForestTextPointers:
+ViridianForest_TextPointers:
 	dw ViridianForestText1
 	dw ViridianForestText2
 	dw ViridianForestText3
@@ -30,7 +30,6 @@ ViridianForestTextPointers:
 	dw ViridianForestText15
 	dw ViridianForestText16
 
-ViridianForestTrainerHeaders:
 ViridianForestTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0
 	db ($4 << 4) ; trainer's view range
diff --git a/scripts/viridianforest2.asm b/scripts/ViridianForest2.asm
index 489db39c..489db39c 100755
--- a/scripts/viridianforest2.asm
+++ b/scripts/ViridianForest2.asm
diff --git a/scripts/viridianforestexit.asm b/scripts/ViridianForestNorthGate.asm
index af7a8523..e421bf5b 100755
--- a/scripts/viridianforestexit.asm
+++ b/scripts/ViridianForestNorthGate.asm
@@ -1,7 +1,7 @@
-ViridianForestExitScript:
+ViridianForestNorthGate_Script:
 	jp EnableAutoTextBoxDrawing
 
-ViridianForestExitTextPointers:
+ViridianForestNorthGate_TextPointers:
 	dw ViridianForestExitText1
 	dw ViridianForestExitText2
 
diff --git a/scripts/viridianforestentrance.asm b/scripts/ViridianForestSouthGate.asm
index 95db8bbc..6eaaaace 100755
--- a/scripts/viridianforestentrance.asm
+++ b/scripts/ViridianForestSouthGate.asm
@@ -1,8 +1,8 @@
-ViridianForestEntranceScript:
+ViridianForestSouthGate_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-ViridianForestEntranceTextPointers:
+ViridianForestSouthGate_TextPointers:
 	dw ViridianForestEntranceText1
 	dw ViridianForestEntranceText2
 
diff --git a/scripts/viridiangym.asm b/scripts/ViridianGym.asm
index 75814e49..b0f94b9d 100755
--- a/scripts/viridiangym.asm
+++ b/scripts/ViridianGym.asm
@@ -1,10 +1,10 @@
-ViridianGymScript:
+ViridianGym_Script:
 	ld hl, Gym8CityName
 	ld de, Gym8LeaderName
 	call LoadGymLeaderAndCityName
 	call EnableAutoTextBoxDrawing
-	ld hl, ViridianGymTrainerHeaders
-	ld de, ViridianGymScriptPointers
+	ld hl, ViridianGymTrainerHeader0
+	ld de, ViridianGym_ScriptPointers
 	ld a, [wViridianGymCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wViridianGymCurScript], a
@@ -22,7 +22,7 @@ ViridianGymScript_748d6:
 	ld [wCurMapScript], a
 	ret
 
-ViridianGymScriptPointers:
+ViridianGym_ScriptPointers:
 	dw ViridianGymScript0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -168,7 +168,7 @@ ViridianGymScript3_74995:
 	SetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE
 	jp ViridianGymScript_748d6
 
-ViridianGymTextPointers:
+ViridianGym_TextPointers:
 	dw ViridianGymText1
 	dw ViridianGymText2
 	dw ViridianGymText3
@@ -184,7 +184,6 @@ ViridianGymTextPointers:
 	dw ViridianGymText13
 	dw ViridianGymText14
 
-ViridianGymTrainerHeaders:
 ViridianGymTrainerHeader0:
 	dbEventFlagBit EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0
 	db ($4 << 4) ; trainer's view range
@@ -307,11 +306,13 @@ ViridianGymText_74ace:
 
 ViridianGymText_74ad3:
 	TX_FAR _ViridianGymText_74ad3
-	db $0b, "@"
+	TX_SFX_LEVEL_UP ; probably supposed to play SFX_GET_ITEM_1 but the wrong music bank is loaded
+	db "@"
 
 ViridianGymText_74ad9:
 	TX_FAR _ViridianGymText_74ad9
-	db $0d, "@"
+	TX_WAIT
+	db "@"
 
 ViridianGymText12:
 	TX_FAR _ViridianGymText12
@@ -319,7 +320,7 @@ ViridianGymText12:
 
 ViridianGymText13:
 	TX_FAR _ReceivedTM27Text
-	db $0b
+	TX_SFX_ITEM_1
 
 TM27ExplanationText:
 	TX_FAR _TM27ExplanationText
diff --git a/scripts/viridianmart.asm b/scripts/ViridianMart.asm
index e20ed48e..d1145778 100755
--- a/scripts/viridianmart.asm
+++ b/scripts/ViridianMart.asm
@@ -1,18 +1,18 @@
-ViridianMartScript:
+ViridianMart_Script:
 	call ViridianMartScript_1d47d
 	call EnableAutoTextBoxDrawing
-	ld hl, ViridianMartScriptPointers
-	ld a, [wViridianMarketCurScript]
-	call JumpTable
+	ld hl, ViridianMart_ScriptPointers
+	ld a, [wViridianMartCurScript]
+	call CallFunctionInTable
 	ret
 
 ViridianMartScript_1d47d:
 	CheckEvent EVENT_OAK_GOT_PARCEL
 	jr nz, .asm_1d489
-	ld hl, ViridianMartTextPointers
+	ld hl, ViridianMart_TextPointers
 	jr .asm_1d48c
 .asm_1d489
-	ld hl, ViridianMartTextPointers + $a ; starts at ViridianCashierText
+	ld hl, ViridianMart_TextPointers2
 .asm_1d48c
 	ld a, l
 	ld [wMapTextPtr], a
@@ -20,7 +20,7 @@ ViridianMartScript_1d47d:
 	ld [wMapTextPtr+1], a
 	ret
 
-ViridianMartScriptPointers:
+ViridianMart_ScriptPointers:
 	dw ViridianMartScript0
 	dw ViridianMartScript1
 	dw ViridianMartScript2
@@ -37,7 +37,7 @@ ViridianMartScript0:
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
 	ld a, $1
-	ld [wViridianMarketCurScript], a
+	ld [wViridianMartCurScript], a
 	ret
 
 RLEMovement1d4bb:
@@ -57,7 +57,7 @@ ViridianMartScript1:
 	call GiveItem
 	SetEvent EVENT_GOT_OAKS_PARCEL
 	ld a, $2
-	ld [wViridianMarketCurScript], a
+	ld [wViridianMartCurScript], a
 	ret
 
 ViridianMartScript2:
@@ -73,12 +73,13 @@ ViridianMartScript2:
 	predef ShowObject
 	ret
 
-ViridianMartTextPointers:
+ViridianMart_TextPointers:
 	dw ViridianMartText1
 	dw ViridianMartText2
 	dw ViridianMartText3
 	dw ViridianMartText4
 	dw ViridianMartText5
+ViridianMart_TextPointers2:
 	dw ViridianCashierText
 	dw ViridianMartText2
 	dw ViridianMartText3
diff --git a/scripts/viridianhouse.asm b/scripts/ViridianNicknameHouse.asm
index 105c8fb6..000fe82b 100755
--- a/scripts/viridianhouse.asm
+++ b/scripts/ViridianNicknameHouse.asm
@@ -1,7 +1,7 @@
-ViridianHouseScript:
+ViridianNicknameHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-ViridianHouseTextPointers:
+ViridianNicknameHouse_TextPointers:
 	dw ViridianHouseText1
 	dw ViridianHouseText2
 	dw ViridianHouseText3
diff --git a/scripts/viridianpokecenter.asm b/scripts/ViridianPokecenter.asm
index 75e6ea6f..5f324bf7 100755
--- a/scripts/viridianpokecenter.asm
+++ b/scripts/ViridianPokecenter.asm
@@ -1,8 +1,8 @@
-ViridianPokeCenterScript:
+ViridianPokecenter_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-ViridianPokecenterTextPointers:
+ViridianPokecenter_TextPointers:
 	dw ViridianHealNurseText
 	dw ViridianPokeCenterText2
 	dw ViridianPokeCenterText3
diff --git a/scripts/school.asm b/scripts/ViridianSchoolHouse.asm
index a64189e3..ccfda145 100755
--- a/scripts/school.asm
+++ b/scripts/ViridianSchoolHouse.asm
@@ -1,8 +1,8 @@
-SchoolScript:
+ViridianSchoolHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-SchoolTextPointers:
+ViridianSchoolHouse_TextPointers:
 	dw SchoolText1
 	dw SchoolText2
 	dw SchoolText3
diff --git a/scripts/school2.asm b/scripts/ViridianSchoolHouse2.asm
index 677a43ec..677a43ec 100755
--- a/scripts/school2.asm
+++ b/scripts/ViridianSchoolHouse2.asm
diff --git a/scripts/fuchsiahouse2.asm b/scripts/WardensHouse.asm
index 7e90aa84..69e199c9 100755
--- a/scripts/fuchsiahouse2.asm
+++ b/scripts/WardensHouse.asm
@@ -1,7 +1,7 @@
-FuchsiaHouse2Script:
+WardensHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-FuchsiaHouse2TextPointers:
+WardensHouse_TextPointers:
 	dw FuchsiaHouse2Text1
 	dw PickUpItemText
 	dw BoulderText
@@ -12,7 +12,7 @@ FuchsiaHouse2Text1:
 	TX_ASM
 	CheckEvent EVENT_GOT_HM04
 	jr nz, .subtract
-	ld b,GOLD_TEETH
+	ld b, GOLD_TEETH
 	call IsItemInBag
 	jr nz, .asm_3f30f
 	CheckEvent EVENT_GAVE_GOLD_TEETH
@@ -69,7 +69,7 @@ WardenGibberishText3:
 
 WardenTeethText1:
 	TX_FAR _WardenTeethText1
-	db $0b
+	TX_SFX_ITEM_1
 
 WardenTeethText2:
 	TX_FAR _WardenTeethText2
@@ -81,7 +81,8 @@ WardenThankYouText:
 
 ReceivedHM04Text:
 	TX_FAR _ReceivedHM04Text
-	db $0B, "@"
+	TX_SFX_ITEM_1
+	db "@"
 
 HM04ExplanationText:
 	TX_FAR _HM04ExplanationText
diff --git a/scripts/diglettscave.asm b/scripts/diglettscave.asm
deleted file mode 100755
index 593b12a6..00000000
--- a/scripts/diglettscave.asm
+++ /dev/null
@@ -1,5 +0,0 @@
-DiglettsCaveScript:
-	jp EnableAutoTextBoxDrawing
-
-DiglettsCaveTextPointers:
-	db "@"
diff --git a/scripts/indigoplateau.asm b/scripts/indigoplateau.asm
deleted file mode 100755
index 6a6fdb6c..00000000
--- a/scripts/indigoplateau.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-IndigoPlateauScript:
-	ret
-
-IndigoPlateauTextPointers:
diff --git a/scripts/ssanne4.asm b/scripts/ssanne4.asm
deleted file mode 100755
index c9411717..00000000
--- a/scripts/ssanne4.asm
+++ /dev/null
@@ -1,5 +0,0 @@
-SSAnne4Script:
-	jp EnableAutoTextBoxDrawing
-
-SSAnne4TextPointers:
-	db "@"
diff --git a/scripts/undergroundpathns.asm b/scripts/undergroundpathns.asm
deleted file mode 100755
index 8c744740..00000000
--- a/scripts/undergroundpathns.asm
+++ /dev/null
@@ -1,5 +0,0 @@
-UndergroundPathNSScript:
-	jp EnableAutoTextBoxDrawing
-
-UndergroundPathNSTextPointers:
-	db "@"
diff --git a/scripts/undergroundpathwe.asm b/scripts/undergroundpathwe.asm
deleted file mode 100755
index 921d3dab..00000000
--- a/scripts/undergroundpathwe.asm
+++ /dev/null
@@ -1,5 +0,0 @@
-UndergroundPathWEScript:
-	jp EnableAutoTextBoxDrawing
-
-UndergroundPathWETextPointers:
-	db "@"