map_header → map_def; map_header_2 → map_data

home/trainers.asm

@@ -2,7 +2,7 @@ CheckTrainerBattle2:: ; 3600
 	ld a, [hROMBank]
 	push af
 
-	call SwitchToMapScriptHeaderBank
+	call SwitchToMapScriptsBank
 	call CheckTrainerBattle
 
 	pop bc
@@ -110,7 +110,7 @@ TalkToTrainer:: ; 3674
 	ld [EngineBuffer3], a
 
 LoadTrainer_continue:: ; 367e
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	ld [EngineBuffer1], a
 
 	ld a, [hLastTalked]
@@ -120,8 +120,8 @@ LoadTrainer_continue:: ; 367e
 	add hl, bc
 	ld a, [EngineBuffer1]
 	call GetFarHalfword
-	ld de, wTempTrainerHeader
-	ld bc, wTempTrainerHeaderEnd - wTempTrainerHeader
+	ld de, wTempTrainer
+	ld bc, wTempTrainerEnd - wTempTrainer
 	ld a, [EngineBuffer1]
 	call FarCopyBytes
 	xor a
@@ -221,7 +221,7 @@ CheckTrainerFlag:: ; 36f5
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	call GetFarHalfword
 	ld d, h
 	ld e, l
@@ -255,7 +255,7 @@ PrintWinLossText:: ; 3718
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	call GetMapScriptHeaderBank
+	call GetMapScriptsBank
 	call FarPrintText
 	call WaitBGMap
 	call WaitPressAorB_BlinkCursor