Build files in maps/

author: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> 2018-07-08 17:34:41 -0400
committer: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> 2018-07-08 17:34:41 -0400
commit: ca09233c9eca4c6b9b0ccfba436dcd7e3b3e669c (patch)
tree: 4f7596be6169491f801756fdda59d6b51a751afe /maps
parent: 116b3b251931b0cd973d5d3f312fa32c2b16b197 (diff)
18 files changed, 714 insertions, 703 deletions
diff --git a/maps/Map13.asm b/maps/Map13.asm
deleted file mode 100644
index ed74a16..0000000
--- a/maps/Map13.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-include "constants.asm"
-
-SECTION "maps/Map13.asm", ROMX
-
-Map13ScriptLoader:: ; 6078
-	ld hl, Map13ScriptPointers
-	call RunMapScript
-	call WriteBackMapScriptNumber
-	ret
-	
-Map13ScriptPointers: ; 6082
-	dw Map13Script
-	dw Map13NPCIDs
-	
-Map13NPCIDs: ; 6086
-	db $FF 
-	
-Map13TextPointers: ; 6087
-	dw MapDefaultText
-	dw MapDefaultText
-	
-Map13Script: ; 608B
-	ld hl, Map13NPCIDs
-	ld de, Map13TextPointers
-	call CallMapTextSubroutine
-	ret
-\ No newline at end of file
diff --git a/maps/PlayerHouse1F.asm b/maps/PlayerHouse1F.asm
new file mode 100644
index 0000000..52af3ce
--- /dev/null
+++ b/maps/PlayerHouse1F.asm
@@ -0,0 +1,61 @@
+include "constants.asm"
+
+SECTION "Player's House 1F", ROMX[$409C], BANK[$34]
+
+PlayerHouse1FScriptLoader:: ; 409C
+	ld hl, PlayerHouse1FScriptPointers
+	call RunMapScript
+	call WriteBackMapScriptNumber
+	ret
+	
+PlayerHouse1FScriptPointers: ; 40A6
+	dw PlayerHouse1FScript1 
+	dw PlayerHouse1FNPCIDs1 
+	dw PlayerHouse1FScript2 
+	dw PlayerHouse1FNPCIDs2 
+	
+PlayerHouse1FNPCIDs1: ; 40AE
+	db $FF
+	
+PlayerHouse1FNPCIDs2: ; 40AF
+	db 0
+	db $FF
+	
+PlayerHouse1FScript1: ; 40B1
+	ld hl, PlayerHouse1FNPCIDs1
+	ld de, PlayerHouse1FSignPointers
+	call CallMapTextSubroutine
+	ret
+	
+PlayerHouse1FScript2: ; 40BB
+	ld hl, PlayerHouse1FNPCIDs2
+	ld de, PlayerHouse1FSignPointers
+	call CallMapTextSubroutine
+	ret
+	
+PlayerHouse1FSignPointers: ; 40C5
+	dw Function38ab 
+	dw Function38b4 
+	dw Function38a2 
+	dw Function38bd 
+	dw Function3899
+PlayerHouse1FTextPointers::
+	dw PlayerHouse1FNPCText1 
+	
+PlayerHouse1FNPCText1: ; 40D1
+	ld hl, PlayerHouse1FTextString1
+	call OpenTextbox
+	ret
+	
+PlayerHouse1FTextString1: ; 40D8
+	text "おかあさん『えっ　あなた"
+	line "オーキドはかせに"
+	cont "ポケモンずかんを　つくってくれって"
+	cont "たのまれたの？"
+	
+	para "すごいじゃない！"
+	line "わたしも　ポケモン　きらいって"
+	cont "わけじゃないし　がんばるのよ！"
+	done
+	
+; 4132
+\ No newline at end of file
diff --git a/maps/PlayersHouse2F.asm b/maps/PlayerHouse2F.asm
index 973b57c..f2be5e1 100644
--- a/maps/PlayersHouse2F.asm
+++ b/maps/PlayerHouse2F.asm
@@ -1,47 +1,49 @@
 include "constants.asm"
 
-SECTION "maps/PlayersHouse2F.asm", ROMX
+SECTION "Player's House 2F", ROMX[$418B], BANK[$34]
 
-PlayersHouse2FScriptLoader:: ; 418B
-	ld hl, PlayersHouse2FScriptPointers
+PlayerHouse2FScriptLoader:: ; 418B
+	ld hl, PlayerHouse2FScriptPointers
 	call RunMapScript
 	call WriteBackMapScriptNumber
 	ret
 	
-PlayersHouse2FScriptPointers: ; 4195
-	dw PlayersHouse2FScript1 
-	dw PlayersHouse2FNPCIDs1 
-	dw PlayersHouse2FScript2 
-	dw PlayersHouse2FNPCIDs2 
-	dw PlayersHouse2FScript3 
-	dw PlayersHouse2FDollText 
+PlayerHouse2FScriptPointers: ; 4195
+	dw PlayerHouse2FScript1
+	dw PlayerHouse2FNPCIDs1
+	dw PlayerHouse2FScript2 
+	dw PlayerHouse2FNPCIDs2
+
+PlayerHouse2FTextPointers::
+	dw PlayerHouse2FText1
+	dw PlayerHouse2FDollText
 	
-PlayersHouse2FNPCIDs1: ; 41A1
+PlayerHouse2FNPCIDs1: ; 41A1
 	db 0
 	db 1
 	db $FF
 	
-PlayersHouse2FNPCIDs2: ; 41A4
+PlayerHouse2FNPCIDs2: ; 41A4
 	db 1
 	db $FF
 	
-PlayersHouse2FTextPointers: ; 41A6
+PlayerHouse2FSignPointers: ; 41A6
 	dw Function3899 
-	dw PlayersHouse2FRadioText
-	dw PlayersHouse2FComputerText 
+	dw PlayerHouse2FRadioText
+	dw PlayerHouse2FComputerText
 	dw Function3899 
-	dw PlayersHouse2FN64Text 
+	dw PlayerHouse2FN64Text 
 	
-PlayersHouse2FScript1: ; 41B0
-	call PlayersHouse2PositionCheck
+PlayerHouse2FScript1: ; 41B0
+	call PlayerHouse2PositionCheck
 	ret z
-	ld hl, PlayersHouse2FNPCIDs1
-	ld de, PlayersHouse2FTextPointers
+	ld hl, PlayerHouse2FNPCIDs1
+	ld de, PlayerHouse2FSignPointers
 	call CallMapTextSubroutine
 	ret nz
 	ret
 	
-PlayersHouse2PositionCheck: ; 41BF
+PlayerHouse2PositionCheck: ; 41BF
 	ld hl, wd41a
 	bit 0, [hl]
 	ret nz
@@ -56,13 +58,13 @@ PlayersHouse2PositionCheck: ; 41BF
 	ld a, LEFT
 	ld d, 0
 	call SetObjectFacing
-	ld hl, PlayersHouse2FTextString2
+	ld hl, PlayerHouse2FTextString2
 	call OpenTextbox
-	call PlayersHouse2FMovePlayer
+	call PlayerHouse2FMovePlayer
 	call ClearAccumulator
 	ret
 	
-PlayersHouse2FMovePlayer: ; 41EA
+PlayerHouse2FMovePlayer: ; 41EA
 	ld a, 0
 	ld hl, Movement
 	call LoadMovementDataPointer
@@ -77,42 +79,42 @@ Movement: ; 41FD
 	db $04
 	db $32
 	
-PlayersHouse2FScript2: ; 4200
-	ld hl, PlayersHouse2FNPCIDs2
-	ld de, PlayersHouse2FTextPointers
+PlayerHouse2FScript2: ; 4200
+	ld hl, PlayerHouse2FNPCIDs2
+	ld de, PlayerHouse2FSignPointers
 	call CallMapTextSubroutine
 	ret
 	
-PlayersHouse2FScript3: ; 420A
+PlayerHouse2FText1: ; 420A
 	ld hl, wd41a
 	bit 3, [hl]
 	jr nz, .jump
-	ld hl, PlayersHouse2FTextString1
+	ld hl, PlayerHouse2FTextString1
 	call OpenTextbox
 	ld hl, wd41a
 	set 3, [hl]
 	ld c, 3
 	call DelayFrames
 .jump
-	ld hl, PlayersHouse2FTextString2
+	ld hl, PlayerHouse2FTextString2
 	call OpenTextbox
 	ret
 	
-PlayersHouse2FDollText: ; 4228
-	ld hl, PlayersHouse2FTextString3
+PlayerHouse2FDollText: ; 4228
+	ld hl, PlayerHouse2FTextString3
 	call OpenTextbox
 	ret
 	
-PlayersHouse2FRadioText: ; 422F
-	ld hl, PlayersHouse2FTextString9
+PlayerHouse2FRadioText: ; 422F
+	ld hl, PlayerHouse2FTextString9
 	call OpenTextbox
 	ret
 	
-PlayersHouse2FComputerText: ; 4236
+PlayerHouse2FComputerText: ; 4236
 	ld hl, wd41a
 	bit 0, [hl]
 	jr nz, .jump
-	ld hl, PlayersHouse2FTextString5
+	ld hl, PlayerHouse2FTextString5
 	call OpenTextbox
 	ret
 
@@ -123,27 +125,27 @@ PlayersHouse2FComputerText: ; 4236
 	call Function1fea
 	ret
 	
-PlayersHouse2FCheckEmail: ; 4253
+PlayerHouse2FCheckEmail: ; 4253
 	call YesNoBox
 	jr c, .jump2
 	ld hl, wd41a
 	set 0, [hl]
-	ld hl, PlayersHouse2FTextString6
+	ld hl, PlayerHouse2FTextString6
 	call PrintText
 	ret
 	
 .jump2
 ; 4264
-	ld hl, PlayersHouse2FTextString7
+	ld hl, PlayerHouse2FTextString7
 	call PrintText
 	ret
 	
-PlayersHouse2FN64Text: ; 426B
-	ld hl, PlayersHouse2FTextString4
+PlayerHouse2FN64Text: ; 426B
+	ld hl, PlayerHouse2FTextString4
 	call OpenTextbox
 	ret
 	
-PlayersHouse2FTextString1: ; 4272
+PlayerHouse2FTextString1: ; 4272
 	text "ケン『おっ　おまえの　うでで"
 	line "ひかりかがやく　そのとけいは⋯⋯"
 	cont "<PLAYER>も　ついに"
@@ -163,27 +165,27 @@ PlayersHouse2FTextString1: ; 4272
 	cont "きょうは　むり　だぜ！"
 	done
 	
-PlayersHouse2FTextString2: ; 4332
+PlayerHouse2FTextString2: ; 4332
 	text "そうだ　おまえの　パソコンに"
 	line "メールが　とどいていたな"
 	cont "でかけるんなら"
 	cont "メールぐらい　よんでおけよ"
 	done
 	
-PlayersHouse2FTextString3: ; 4365
+PlayerHouse2FTextString3: ; 4365
 	text "クりスマスに　カントーの"
 	line "しんせきに　プレゼント"
 	cont "してもらった　にんぎょうだ"
 	done
 	
-PlayersHouse2FTextString4: ; 438D
+PlayerHouse2FTextString4: ; 438D
 	text "ニンテンドウ６４を　してる！"
 	cont "⋯⋯　⋯⋯　さてと！"
 	cont "そろそろ　そとに　あそびに"
 	cont "でかけるか！"
 	done
 	
-PlayersHouse2FTextString5: ; 43BD
+PlayerHouse2FTextString5: ; 43BD
 	text "<PLAYER>は"
 	line "パソコンの　スイッチを　いれた！"
 	
@@ -194,11 +196,11 @@ PlayersHouse2FTextString5: ; 43BD
 	db $08
 	
 ; 43F3
-	call PlayersHouse2FCheckEmail
+	call PlayerHouse2FCheckEmail
 	call Function3036
 	ret
 	
-PlayersHouse2FTextString6: ; 43FA
+PlayerHouse2FTextString6: ; 43FA
 	text "とつぜん　メールを　さしあげる"
 	line "しつれいを　おゆるしあれ"
 	
@@ -208,12 +210,12 @@ PlayersHouse2FTextString6: ; 43FA
 	cont "ポケモンけんきゅうしゃ　オーキド"
 	done
 	
-PlayersHouse2FTextString7: ; 4456
+PlayerHouse2FTextString7: ; 4456
 	text "あとで"
 	line "よもっと<⋯⋯>"
 	done
 	
-PlayersHouse2FTextString8: ; 4461 (unused?)
+PlayerHouse2FTextString8: ; 4461 (unused?)
 	text "しんはつばい　トレーナーギア！"
 	line "ポケモントレーナーの　ための"
 	cont "さいせんたんの　とけい　です"
@@ -231,7 +233,7 @@ PlayersHouse2FTextString8: ; 4461 (unused?)
 	cont "シルフの　ホームぺージだ"
 	done
 	
-PlayersHouse2FTextString9: ; 44FE
+PlayerHouse2FTextString9: ; 44FE
 	text "<PLAYER>は"
 	line "ラジオのスイッチを　おした！"
 	
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
deleted file mode 100644
index f93f363..0000000
--- a/maps/PlayersHouse1F.asm
+++ /dev/null
@@ -1,60 +0,0 @@
-include "constants.asm"
-
-SECTION "maps/PlayersHouse1F.asm", ROMX
-
-PlayersHouse1FScriptLoader:: ; 409C
-	ld hl, PlayersHouse1FScriptPointers
-	call RunMapScript
-	call WriteBackMapScriptNumber
-	ret
-	
-PlayersHouse1FScriptPointers: ; 40A6
-	dw PlayersHouse1FScript1 
-	dw PlayersHouse1FNPCIDs1 
-	dw PlayersHouse1FScript2 
-	dw PlayersHouse1FNPCIDs2 
-	
-PlayersHouse1FNPCIDs1: ; 40AE
-	db $FF
-	
-PlayersHouse1FNPCIDs2: ; 40AF
-	db 0
-	db $FF
-	
-PlayersHouse1FScript1: ; 40B1
-	ld hl, PlayersHouse1FNPCIDs1
-	ld de, PlayersHouse1FTextPointers
-	call CallMapTextSubroutine
-	ret
-	
-PlayersHouse1FScript2: ; 40BB
-	ld hl, PlayersHouse1FNPCIDs2
-	ld de, PlayersHouse1FTextPointers
-	call CallMapTextSubroutine
-	ret
-	
-PlayersHouse1FTextPointers: ; 40C5
-	dw Function38ab 
-	dw Function38b4 
-	dw Function38a2 
-	dw Function38bd 
-	dw Function3899 
-	dw PlayersHouse1FNPCText1 
-	
-PlayersHouse1FNPCText1: ; 40D1
-	ld hl, PlayersHouse1FTextString1
-	call OpenTextbox
-	ret
-	
-PlayersHouse1FTextString1: ; 40D8
-	text "おかあさん『えっ　あなた"
-	line "オーキドはかせに"
-	cont "ポケモンずかんを　つくってくれって"
-	cont "たのまれたの？"
-	
-	para "すごいじゃない！"
-	line "わたしも　ポケモン　きらいって"
-	cont "わけじゃないし　がんばるのよ！"
-	done
-	
-; 4132
-\ No newline at end of file
diff --git a/maps/Route1Gate1F.asm b/maps/Route1Gate1F.asm
index 1ab0485..c393aa6 100644
--- a/maps/Route1Gate1F.asm
+++ b/maps/Route1Gate1F.asm
@@ -1,8 +1,8 @@
 include "constants.asm"
 
-SECTION "maps/Route1Gate1F.asm", ROMX
+SECTION "Route 1 Gate 1F", ROMX[$4061], BANK[$26]
 
-Route1Gate1FScriptLoader: ;4061
+Route1Gate1FScriptLoader:: ;4061
 	ld hl, Route1Gate1FScriptPointers
 	call RunMapScript
 	call WriteBackMapScriptNumber
@@ -17,14 +17,15 @@ Route1Gate1FNPCIDs: ; 406F
 	db $01
 	db $FF
 
-Route1Gate1FTextPointers:
+Route1Gate1FSignPointers: ; 4072
 	dw MapDefaultText ;no signs
+Route1Gate1FTextPointers:: ; 4074
 	dw Route1Gate1FText1
 	dw Route1Gate1FText2
 
 Route1Gate1FScript: ; 4078
 	ld hl, Route1Gate1FNPCIDs
-	ld de, Route1Gate1FTextPointers
+	ld de, Route1Gate1FSignPointers
 	call CallMapTextSubroutine
 	ret
 
diff --git a/maps/Route1Gate2F.asm b/maps/Route1Gate2F.asm
index 7f9ec79..ca8009d 100644
--- a/maps/Route1Gate2F.asm
+++ b/maps/Route1Gate2F.asm
@@ -1,6 +1,6 @@
 include "constants.asm"
 
-SECTION "maps/Route1Gate2F.asm", ROMX
+SECTION "Route 1 Gate 2F", ROMX[$411F], BANK[$26]
 
 Route1Gate2FScriptLoader:: ; 411F
 	ld hl, Route1Gate2FScriptPointers
@@ -16,16 +16,17 @@ Route1Gate2FNPCIDs: ; 412D
 	db 0
 	db 1
 	db $FF
-	
-Route1Gate2FTextPointers: ; 4130
+
+Route1Gate2FSignPointers: ; 4130
 	dw Route1Gate2FTextSign1 
 	dw Route1Gate2FTextSign2 
+Route1Gate2FTextPointers:: ; 4134
 	dw Route1Gate2FTextNPC1 
 	dw Route1Gate2FTextNPC2
 	
 Route1Gate2FScript:: ; 4138
 	ld hl, Route1Gate2FNPCIDs
-	ld de, Route1Gate2FTextPointers
+	ld de, Route1Gate2FSignPointers
 	call CallMapTextSubroutine
 	ret
 	
diff --git a/maps/Route1P1.asm b/maps/Route1P1.asm
index 28bb505..f9a3e64 100644
--- a/maps/Route1P1.asm
+++ b/maps/Route1P1.asm
@@ -1,6 +1,6 @@
 include "constants.asm"
 
-SECTION "maps/Route1P1.asm", ROMX
+SECTION "Route 1 East", ROMX[$7B98], BANK[$36]
 
 Route1P1ScriptLoader:: ; 7B98
 	ld hl, Route1P1ScriptPointers
@@ -17,15 +17,17 @@ Route1P1NPCIDs: ; 7BA6
 	db 1
 	db $FF
 	
-Route1P1TextPointers: ;7BA9
+Route1P1SignPointers: ; 7BA9
 	dw Route1P1TextSign1
 	dw Route1P1TextSign2
+
+Route1P1TextPointers::
 	dw Route1P1TextNPC1
 	dw Route1P1TextNPC2
 	
 Route1P1Script:: ; 7BB1
 	ld hl, Route1P1NPCIDs
-	ld de, Route1P1TextPointers
+	ld de, Route1P1SignPointers
 	call CallMapTextSubroutine
 	ret
 
diff --git a/maps/Route1P2.asm b/maps/Route1P2.asm
index f47cce9..fa38d9e 100644
--- a/maps/Route1P2.asm
+++ b/maps/Route1P2.asm
@@ -1,6 +1,6 @@
 include "constants.asm"
 
-SECTION "maps/Route1P2.asm", ROMX
+SECTION "Route 1 West", ROMX[$7C68], BANK[$36]
 
 Route1P2ScriptLoader:: ; 7C67
 	ld hl, Route1P2ScriptPointers
@@ -17,8 +17,10 @@ Route1P2NPCIDs: ; 7C76
 	db $01
 	db $FF
 
-Route1P2TextPointers:
+Route1P2SignPointers:
 	dw Route1P2TextSign1
+
+Route1P2TextPointers::
 	dw Route1P2Text1
 	dw Route1P2Text2
 
@@ -38,7 +40,7 @@ Route1P2Script:: ; 7C7F
 	jr .endDemo
 .skipCheck
 	ld hl, Route1P2NPCIDs ;data
-	ld de, Route1P2TextPointers ;start of textld pointers?
+	ld de, Route1P2SignPointers ;start of textld pointers?
 	call CallMapTextSubroutine
 	ret
 
diff --git a/maps/SilentHills.asm b/maps/SilentHill.asm
index 37f567f..f699a44 100644
--- a/maps/SilentHills.asm
+++ b/maps/SilentHill.asm
@@ -1,59 +1,59 @@
 include "constants.asm"
 
-SECTION "maps/SilentHills.asm", ROMX
+SECTION "Silent Hills Script", ROMX[$7669], BANK[$36]
 
-SilentHillsScriptLoader:: ; 7669
-	ld hl, SilentHillsScriptPointers1
+SilentHillScriptLoader:: ; 7669
+	ld hl, SilentHillScriptPointers1
 	call RunMapScript
 	call WriteBackMapScriptNumber
 	ret
 	
-SilentHillsNPCIDs1: ; 7673
+SilentHillNPCIDs1: ; 7673
 	db 0
 	db 2
 	db 3
 	db $FF
 	
-SilentHillsNPCIDs2: ; 7677
+SilentHillNPCIDs2: ; 7677
 	db 2
 	db 3
 	db $FF
 	
-SilentHillsNPCIDs3: ; 767A
+SilentHillNPCIDs3: ; 767A
 	db 1
 	db 2
 	db 3
 	db $FF
 	
-SilentHillsScriptPointers1: ; 767E
-	dw SilentHillsScript1
-	dw SilentHillsNPCIDs1 
+SilentHillScriptPointers1: ; 767E
+	dw SilentHillScript1
+	dw SilentHillNPCIDs1 
 	
-SilentHillsScriptPointers2: ; 7682
-	dw SilentHillsScript2 
-	dw SilentHillsNPCIDs1 
+SilentHillScriptPointers2: ; 7682
+	dw SilentHillScript2 
+	dw SilentHillNPCIDs1 
 	
-SilentHillsScriptPointers3: ; 7686
-	dw SilentHillsScript3 
-	dw SilentHillsNPCIDs1 
+SilentHillScriptPointers3: ; 7686
+	dw SilentHillScript3 
+	dw SilentHillNPCIDs1 
 	
-SilentHillsScriptPointers4: ; 768A
-	dw SilentHillsScript4 
-	dw SilentHillsNPCIDs2 
+SilentHillScriptPointers4: ; 768A
+	dw SilentHillScript4 
+	dw SilentHillNPCIDs2 
 	
-SilentHillsScriptPointers5: ; 768E
-	dw SilentHillsScript5 
-	dw SilentHillsNPCIDs3 
+SilentHillScriptPointers5: ; 768E
+	dw SilentHillScript5 
+	dw SilentHillNPCIDs3 
 	
-SilentHillsScriptPointers6: ; 7692
-	dw SilentHillsScript6 
-	dw SilentHillsNPCIDs2 
+SilentHillScriptPointers6: ; 7692
+	dw SilentHillScript6 
+	dw SilentHillNPCIDs2 
 	
-SilentHillsScriptPointers7: ; 7696
-	dw SilentHillsScript7 
-	dw SilentHillsNPCIDs2 
+SilentHillScriptPointers7: ; 7696
+	dw SilentHillScript7 
+	dw SilentHillNPCIDs2 
 	
-SilentHillsScript1: ; 769A
+SilentHillScript1: ; 769A
 	ld a, [wYCoord]
 	cp 5
 	ret nz
@@ -65,7 +65,7 @@ SilentHillsScript1: ; 769A
 	ld a, 02
 	call Function17f9
 	ld a, 02
-	ld hl, SilentHillsMovement1
+	ld hl, SilentHillMovement1
 	call LoadMovementDataPointer
 	ld hl, wc5ed
 	set 7, [hl]
@@ -75,7 +75,7 @@ SilentHillsScript1: ; 769A
 	call WriteIntod637
 	ret
 	
-SilentHillsMovement1: ; 76C8
+SilentHillMovement1: ; 76C8
 	db $0D 
 	db $0D 
 	db $0D 
@@ -84,18 +84,18 @@ SilentHillsMovement1: ; 76C8
 	db $02 
 	db $32
 	
-SilentHillsScript2: ; 76CF
+SilentHillScript2: ; 76CF
 	ld a, 0
 	ld d, RIGHT
 	call SetObjectFacing
-	ld hl, SilentHillsTextRival1
+	ld hl, SilentHillTextRival1
 	call OpenTextbox
-	ld hl, SilentHillsTextRival2
+	ld hl, SilentHillTextRival2
 	call OpenTextbox
 	ld hl, wJoypadFlags
 	set 4, [hl]
 	ld a, 2
-	ld hl, SilentHillsMovement2
+	ld hl, SilentHillMovement2
 	call LoadMovementDataPointer
 	ld hl, wc5ed
 	set 7, [hl]
@@ -105,17 +105,17 @@ SilentHillsScript2: ; 76CF
 	ld [wMapScriptNumber], a
 	ret
 	
-SilentHillsMovement2: ; 76FF
+SilentHillMovement2: ; 76FF
 	db $00, $04, $08, $0C, $0C, $0C, $33
 	
-SilentHillsScript3: ;7706
+SilentHillScript3: ;7706
 	call Function1848
 	ld a, 3
 	ld [wMapScriptNumber], a
 	call InitUnknownBuffercc9e
 	ret
 	
-SilentHillsScript4: ; 7712
+SilentHillScript4: ; 7712
 	ld a, [wXCoord]
 	cp 0
 	jr nz, .bigjump
@@ -126,7 +126,7 @@ SilentHillsScript4: ; 7712
 	jr nz, .bigjump
 .jump
 	call Function776a
-	ld hl, SilentHillsTextNorthExit
+	ld hl, SilentHillTextNorthExit
 	call OpenTextbox
 	ld hl, wJoypadFlags
 	set 4, [hl]
@@ -137,10 +137,10 @@ SilentHillsScript4: ; 7712
 	ld a, [wYCoord]
 	cp 9
 	jr z, .jump2
-	ld hl, SilentHillsMovement3
+	ld hl, SilentHillMovement3
 	jr .skip
 .jump2
-	ld hl, SilentHillsMovement4
+	ld hl, SilentHillMovement4
 .skip
 	ld a, 03
 	call LoadMovementDataPointer
@@ -153,8 +153,8 @@ SilentHillsScript4: ; 7712
 	ret
 
 .bigjump	
-	ld hl, SilentHillsNPCIDs2
-	ld de, SilentHillsTextPointers
+	ld hl, SilentHillNPCIDs2
+	ld de, SilentHillSignPointers
 	call CallMapTextSubroutine
 	ret
 	
@@ -166,17 +166,17 @@ Function776a: ; 776A
 	ld [hl], a
 	ret
 	
-SilentHillsMovement3: ; 7776
+SilentHillMovement3: ; 7776
 	db $0A, $0A, $0A, $09, $0A, $06, $02, $32
 	
-SilentHillsMovement4: ; 777E
+SilentHillMovement4: ; 777E
 	db $0A, $0A, $0A, $0A, $06, $02, $32
 	
-SilentHillsScript5: ; 7785
+SilentHillScript5: ; 7785
 	ld a, 0
 	ld d, RIGHT
 	call SetObjectFacing
-	ld hl, SilentHillsTextPokemonInGrassString
+	ld hl, SilentHillTextPokemonInGrassString
 	call OpenTextbox
 	ld hl, wJoypadFlags
 	set 4, [hl]
@@ -190,10 +190,10 @@ SilentHillsScript5: ; 7785
 	ld a, [wYCoord]
 	cp 9
 	jr z, .jump
-	ld hl, SilentHillsMovement5
+	ld hl, SilentHillMovement5
 	jr .skip
 .jump	
-	ld hl, SilentHillsMovement6
+	ld hl, SilentHillMovement6
 .skip
 	ld a, 3
 	call LoadMovementDataPointer
@@ -205,15 +205,15 @@ SilentHillsScript5: ; 7785
 	ld [wMapScriptNumber], a
 	ret
 	
-SilentHillsMovement5: ; 77CC
+SilentHillMovement5: ; 77CC
 	db $0B, $0B, $0B, $0B, $0B, $0B, $08, $08, $08, $08, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $05, $33
 	
-SilentHillsMovement6: ; 77E0
+SilentHillMovement6: ; 77E0
 	db $0B, $0B, $0B, $0B, $0B, $0B, $08, $08, $08, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $0B, $05, $33
 	
-SilentHillsScript6: ; 77F3
-	ld hl, SilentHillsNPCIDs2
-	ld de, SilentHillsTextPointers
+SilentHillScript6: ; 77F3
+	ld hl, SilentHillNPCIDs2
+	ld de, SilentHillSignPointers
 	call CallMapTextSubroutine
 	ld hl, wd41b
 	bit 2, [hl]
@@ -224,11 +224,11 @@ SilentHillsScript6: ; 77F3
 	ld [wMapScriptNumber], a
 	ret
 	
-SilentHillsScript7: ; 780D
+SilentHillScript7: ; 780D
 	call CheckLabDoor 
 	ret z
-	ld hl, SilentHillsNPCIDs2
-	ld de, SilentHillsTextPointers
+	ld hl, SilentHillNPCIDs2
+	ld de, SilentHillSignPointers
 	call CallMapTextSubroutine
 	ret
 	
@@ -251,7 +251,7 @@ CheckLabDoor: ; 781B
 	call SetObjectFacing
 	ld hl, wJoypadFlags
 	set 6, [hl]
-	ld hl, SilentHillsTextString1
+	ld hl, SilentHillTextString1
 	call OpenTextbox
 	call LabClosed
 	call ClearAccumulator
@@ -259,7 +259,7 @@ CheckLabDoor: ; 781B
 	
 LabClosed: ; 784C
 	ld a, 0
-	ld hl, SilentHillsMovement7
+	ld hl, SilentHillMovement7
 	call LoadMovementDataPointer
 	ld hl, wc5ed
 	set 7, [hl]
@@ -267,64 +267,64 @@ LabClosed: ; 784C
 	call WriteIntod637
 	ret
 	
-SilentHillsTextString1: ; 785F
+SilentHillTextString1: ; 785F
 	text "あれ？　カギが　かかっている"
 	done
 	
-SilentHillsMovement7: ; 786F
+SilentHillMovement7: ; 786F
 	db $04, $32
 
-SilentHillsTextPointers: ; 7871
-	dw SilentHillsPlayerHouseText 
+SilentHillSignPointers:: ; 7871
+	dw SilentHillPlayerHouseText 
 	dw Function38c6 
-	dw SilentHillsSignText1 
-	dw SilentHillsLabText 
-	dw SilentHillsRivalHouseText
+	dw SilentHillSignText1
+	dw SilentHillLabText 
+	dw SilentHillRivalHouseText
 	
-SilentHillsLabText: ; 787B
-	ld hl, SilentHillsTextString2 
+SilentHillLabText: ; 787B
+	ld hl, SilentHillTextString2 
 	call OpenTextbox
 	ret
 	
-SilentHillsTextString2: ; 7882
+SilentHillTextString2: ; 7882
 	text "にゅうきょしゃ　ぼしゅうちゅう！"
 	done
 	
-SilentHillsSignText1: ; 7894
-	ld hl, SilentHillsTextString3
+SilentHillSignText1: ; 7894
+	ld hl, SilentHillTextString3
 	call OpenTextbox
 	ret
 	
-SilentHillsTextString3: ; 789B
+SilentHillTextString3: ; 789B
 	text "ここは　サイレント　ヒル"
 	line "しずかな　おか"
 	done
 	
-SilentHillsPlayerHouseText: ; 78B1
-	ld hl, SilentHillsTextString4
+SilentHillPlayerHouseText: ; 78B1
+	ld hl, SilentHillTextString4
 	call OpenTextbox
 	ret
 	
-SilentHillsTextString4: ; 78B8
+SilentHillTextString4: ; 78B8
 	text "ここは　<PLAYER>　のいえ"
 	done
 	
-SilentHillsRivalHouseText: ; 78C3
-	ld hl, SilentHillsTextString5
+SilentHillRivalHouseText: ; 78C3
+	ld hl, SilentHillTextString5
 	call OpenTextbox
 	ret
 	
-SilentHillsTextString5: ; 78CA
+SilentHillTextString5: ; 78CA
 	text "ここは　<RIVAL>　のいえ"
 	done
 	
-; 78D5
-	dw SilentHillsTextRival1 ; west
-	dw SilentHillsTextNorthExit ; north
-	dw SilentHillsTextBackpack ; npc1
-	dw SilentHillsTextPokemonHate ; npc2
+SilentHillTextPointers:: ; 78d5
+	dw SilentHillTextRival1 ; west
+	dw SilentHillTextNorthExit ; north
+	dw SilentHillTextBackpack ; npc1
+	dw SilentHillTextPokemonHate ; npc2
 
-SilentHillsTextRival1: ; 78DD
+SilentHillTextRival1: ; 78DD
 	text "<RIVAL>『よう　ちょっと　おまえに"
 	cont "じまん　したいことが"
 	cont "あってきたんだよ"
@@ -364,7 +364,7 @@ MomNameMenuHeaderUnused: ; 7989
 	db "ママ@"
 	db "かあちゃん@"
 	
-SilentHillsTextRival2: ; 79AC - BYTE OFF
+SilentHillTextRival2: ; 79AC - BYTE OFF
 	text "<RIVAL>『えー　かっこわりい！"
 	line "そんな　こどもっぽい"
 	cont "よびかた　してるなんて"
@@ -377,12 +377,12 @@ SilentHillsTextRival2: ; 79AC - BYTE OFF
 	cont "いくことに　するぜ！"
 	done
 	
-SilentHillsTextNorthExit: ; 7A14
+SilentHillTextNorthExit: ; 7A14
 	text "ちょいまち！"
 	line "まってよ！　まてっ　てば！"
 	done
 	
-SilentHillsTextPokemonInGrassString: ; 7A2A
+SilentHillTextPokemonInGrassString: ; 7A2A
 	text "きみは　まったく"
 	line "なんにも　しらないんだね！"
 	cont "くさむらでは"
@@ -397,22 +397,22 @@ SilentHillsTextPokemonInGrassString: ; 7A2A
 	cont "ぼくに　ついて　きて！"
 	done
 	
-SilentHillsTextBackpack: ; 7A99
-	ld hl, SilentHillsTextBackpackString
+SilentHillTextBackpack: ; 7A99
+	ld hl, SilentHillTextBackpackString
 	call OpenTextbox 
 	ret
 	
-SilentHillsTextBackpackString: ; 7AA0
+SilentHillTextBackpackString: ; 7AA0
 	text "あなたの　りュック　かっこいいわよ"
 	line "どこで　てに　いれたの？"
 	done
 	
-SilentHillsTextPokemonHate: ; 7AC0
-	ld hl, SilentHillsTextPokemonHateString
+SilentHillTextPokemonHate: ; 7AC0
+	ld hl, SilentHillTextPokemonHateString
 	call OpenTextbox
 	ret
 	
-SilentHillsTextPokemonHateString: ; 7AC7
+SilentHillTextPokemonHateString: ; 7AC7
 	text "よのなかに　ポケモンが　きらいな"
 	line "ひとは　いるのかな？"
 	done
diff --git a/maps/SilentHouse.asm b/maps/SilentHillHouse.asm
index 3d542ec..591c217 100644
--- a/maps/SilentHouse.asm
+++ b/maps/SilentHillHouse.asm
@@ -1,61 +1,61 @@
 include "constants.asm"
 
-SECTION "maps/SilentHouse.asm", ROMX
+SECTION "Silent Hills House", ROMX[$4839], BANK[$34]
 
-SilentHouseScriptLoader:: ; 4839
-	ld hl, SilentHouseScriptPointers
+SilentHillHouseScriptLoader:: ; 4839
+	ld hl, SilentHillHouseScriptPointers
 	call RunMapScript
 	call WriteBackMapScriptNumber
 	ret
 	
-SilentHouseScriptPointers: ; 4843
-	dw SilentHouseScript1
-	dw SilentHouseNPCIDs1 
-	dw SilentHouseScript2 
-	dw SilentHouseNPCIDs2 
-	dw SilentHouseScript3 
-	dw SilentHouseNPCIDs1 
-	
-SilentHouseScript1: ; 484F
-	ld hl, SilentHouseNPCIDs1
-	ld de, SilentHouseTextPointers1
+SilentHillHouseScriptPointers: ; 4843
+	dw SilentHillHouseScript1
+	dw SilentHillHouseNPCIDs1 
+	dw SilentHillHouseScript2 
+	dw SilentHillHouseNPCIDs2 
+	dw SilentHillHouseScript3 
+	dw SilentHillHouseNPCIDs1 
+	
+SilentHillHouseScript1: ; 484F
+	ld hl, SilentHillHouseNPCIDs1
+	ld de, SilentHillHouseTextPointers2
 	call CallMapTextSubroutine
 	ret
 	
-SilentHouseScript2: ; 4859
-	ld hl, SilentHouseNPCIDs2
-	ld de, SilentHouseTextPointers1
+SilentHillHouseScript2: ; 4859
+	ld hl, SilentHillHouseNPCIDs2
+	ld de, SilentHillHouseTextPointers2
 	call CallMapTextSubroutine
 	ret
 	
-SilentHouseScript3: ; 4863
-	ld hl, SilentHouseNPCIDs1
-	ld de, SilentHouseTextPointers1
+SilentHillHouseScript3: ; 4863
+	ld hl, SilentHillHouseNPCIDs1
+	ld de, SilentHillHouseTextPointers2
 	call CallMapTextSubroutine
 	ret
 	
-SilentHouseNPCIDs1: 
+SilentHillHouseNPCIDs1: 
 	db 0
 	db $FF
 	
-SilentHouseNPCIDs2: 
+SilentHillHouseNPCIDs2: 
 	db 0
 	db 1
 	db $FF
 	
-SilentHouseTextPointers1:: ; 4872
-	dw SilentHouseNPCText1 
+SilentHillHouseTextPointers2:: ; 4872
+	dw SilentHillHouseNPCText1 
 	dw Function38bd 
 	dw Function3899 
 	dw Function38b4 
 	dw Function38ab 
 	dw Function38cf 
 	
-SilentHouseNPCText1: ; 487E
+SilentHillHouseNPCText1: ; 487E
 	ld hl, wd41a
 	bit 6, [hl]
 	jr nz, .jump
-	ld hl, SilentHouseTextString1
+	ld hl, SilentHillHouseTextString1
 	call OpenTextbox
 	ret
 
@@ -66,28 +66,28 @@ SilentHouseNPCText1: ; 487E
 	call Function1fea
 	ret
 	
-SilentHouseTextString1: ; 489B
+SilentHillHouseTextString1: ; 489B
 	text "おや？　<RIVAL>あてに　メールが"
 	line "とどいている　ようだ"
 	cont "よんでみる？@"
 	db $08
 	
-SilentHouseNPCText2: ; 48BD (unused due to typo in the text pointers?)
+SilentHillHouseNPCText2: ; 48BD (unused due to typo in the text pointers?)
 	call YesNoBox
 	jr c, .jump
 	ld hl, wd41a
 	set 6, [hl]
-	ld hl, SilentHouseTextString2
+	ld hl, SilentHillHouseTextString2
 	call PrintText
 	call Function3036
 	ret
 .jump
-	ld hl, SilentHouseTextString3
+	ld hl, SilentHillHouseTextString3
 	call PrintText
 	call Function3036
 	ret
 	
-SilentHouseTextString2: ; 48DB
+SilentHillHouseTextString2: ; 48DB
 	text "とつぜん　メールを　さしあげる"
 	line "しつれいを　おゆるしあれ"
 	
@@ -97,43 +97,43 @@ SilentHouseTextString2: ; 48DB
 	cont "ポケモンけんきゅうしゃ　オーキド"
 	done
 	
-SilentHouseTextString3: ; 4937
+SilentHillHouseTextString3: ; 4937
 	text "ひとのメールは"
 	line "みちゃ　いけないよな<⋯⋯>"
 	done
 	
-SilentHouseTextPointers2:: ; 494C
-	dw SilentHouseNPCText3 
-	dw SilentHouseNPCText4
+SilentHillHouseTextPointers:: ; 494C
+	dw SilentHillHouseNPCText3 
+	dw SilentHillHouseNPCText4
 	
-SilentHouseNPCText3: ; 4950
-	ld hl, SilentHouseTextString4
+SilentHillHouseNPCText3: ; 4950
+	ld hl, SilentHillHouseTextString4
 	call OpenTextbox
 	ret
 	
-SilentHouseTextString4: ; 4957
+SilentHillHouseTextString4: ; 4957
 	text "このまえ　かわったいろの"
 	line "ポッポを　みかけたわ"
 	done
 	
-SilentHouseNPCText4: ; 4970
+SilentHillHouseNPCText4: ; 4970
 	ld hl, wd41e
 	bit 2, [hl]
 	jr nz, .jump
 	ld hl, wd41e
 	set 2, [hl]
-	ld hl, SilentHouseTextString5
+	ld hl, SilentHillHouseTextString5
 	call OpenTextbox
 	call WaitBGMap
-	ld hl, SilentHouseTextString6
+	ld hl, SilentHillHouseTextString6
 	jr .skip
 .jump
-	ld hl, SilentHouseTextString7
+	ld hl, SilentHillHouseTextString7
 .skip
 	call OpenTextbox
 	ret
 	
-SilentHouseTextString5: ; 4991
+SilentHillHouseTextString5: ; 4991
 	text "ケン『ななな"
 	line "なんだ　<PLAYER>　じゃないか！"
 	
@@ -151,7 +151,7 @@ SilentHouseTextString5: ; 4991
 	cont "よし　これで　マップが　みれるぞ！"
 	done
 	
-SilentHouseTextString6: ; 4A29
+SilentHillHouseTextString6: ; 4A29
 	text "もし　オールドにいくなら"
 	line "マサキって　やつに　あうといい"
 	
@@ -161,7 +161,7 @@ SilentHouseTextString6: ; 4A29
 	cont "てだすけを　してくれるぜ"
 	done
 	
-SilentHouseTextString7: ; 4A76
+SilentHillHouseTextString7: ; 4A76
 	text "ケン『<PLAYER>"
 	line "オーキドはかせに　みこまれて"
 	cont "ポケモンずかんを　つくるんだって？"
diff --git a/maps/SilentLabP2.asm b/maps/SilentHillLabBack.asm
index 767e62a..33d975e 100644
--- a/maps/SilentLabP2.asm
+++ b/maps/SilentHillLabBack.asm
@@ -1,52 +1,52 @@
 include "constants.asm"
 
-SECTION "maps/SilentLabP2.asm", ROMX
+SECTION "Silent Lab P2 Script", ROMX[$5C69], BANK[$34]
 
-SilentLabP2ScriptLoader:: ; 5C69
-	ld hl, SilentLabP2ScriptPointers
+SilentHillLabBackScriptLoader:: ; 5C69
+	ld hl, SilentHillLabBackScriptPointers
 	call RunMapScript
 	call WriteBackMapScriptNumber
 	ret
 	
-SilentLabP2ScriptPointers: ; 5C73
-	dw SilentLabP2Script1
-	dw SilentLabP2NPCIDs1
-	dw SilentLabP2Script2 
-	dw SilentLabP2NPCIDs1
-	dw SilentLabP2Script3
-	dw SilentLabP2NPCIDs1
-	dw SilentLabP2RivalChoosePokemon
-	dw SilentLabP2NPCIDs1
-	dw SilentLabP2Script5 
-	dw SilentLabP2NPCIDs1 
-	dw SilentLabP2Script6 
-	dw SilentLabP2NPCIDs1 
-	dw SilentLabP2Script7
-	dw SilentLabP2NPCIDs1
-	
-SilentLabP2NPCIDs1: ; 5C8F
+SilentHillLabBackScriptPointers: ; 5C73
+	dw SilentHillLabBackScript1
+	dw SilentHillLabBackNPCIDs1
+	dw SilentHillLabBackScript2 
+	dw SilentHillLabBackNPCIDs1
+	dw SilentHillLabBackScript3
+	dw SilentHillLabBackNPCIDs1
+	dw SilentHillLabBackRivalChoosePokemon
+	dw SilentHillLabBackNPCIDs1
+	dw SilentHillLabBackScript5 
+	dw SilentHillLabBackNPCIDs1 
+	dw SilentHillLabBackScript6 
+	dw SilentHillLabBackNPCIDs1 
+	dw SilentHillLabBackScript7
+	dw SilentHillLabBackNPCIDs1
+	
+SilentHillLabBackNPCIDs1: ; 5C8F
 	db 00, 01, 02, 03, 04, $FF 
-SilentLabP2NPCIDs2: ; 5C95
+SilentHillLabBackNPCIDs2: ; 5C95
 	db 00, 01, 04, $FF 
-SilentLabP2NPCIDs3: ; 5C99
+SilentHillLabBackNPCIDs3: ; 5C99
 	db 00, 01, 02, $FF 
-SilentLabP2NPCIDs4: ; 5C9D
+SilentHillLabBackNPCIDs4: ; 5C9D
 	db 00, 01, 03, $FF
 	
-SilentLabP2TextPointers1: ; 5CA1 
-	dw SilentLabP2Text1
-	dw SilentLabP2Func3
-	dw SilentLabP2Func4 
-	dw SilentLabP2Func4
-	dw SilentLabP2Func4
+SilentHillLabBackTextPointers:: ; 5CA1 
+	dw SilentHillLabBackText1
+	dw SilentHillLabBackFunc3
+	dw SilentHillLabBackFunc4 
+	dw SilentHillLabBackFunc4
+	dw SilentHillLabBackFunc4
 	
-SilentLabP2Script1: ; 5CAB
+SilentHillLabBackScript1: ; 5CAB
 	ld hl, wJoypadFlags
 	set 4, [hl]
 	ld a, 0
 	call Function17f9
 	ld a, 0
-	ld hl, SilentLabP2Movement1
+	ld hl, SilentHillLabBackMovement1
 	call LoadMovementDataPointer
 	ld hl, wd41b
 	set 1, [hl]
@@ -58,38 +58,38 @@ SilentLabP2Script1: ; 5CAB
 	call WriteIntod637
 	ret
 	
-SilentLabP2Movement1: ; 5CD2
+SilentHillLabBackMovement1: ; 5CD2
 	db 09, 09, 05, $32
 	
-SilentLabP2Script2: ; 5CD6
+SilentHillLabBackScript2: ; 5CD6
 	ld hl, wc5ed
 	set 6, [hl]
 	call Function20f8
 	ld a, 3
 	ld d, UP
 	call SetObjectFacing
-	ld hl, SilentLabP2TextString1
+	ld hl, SilentHillLabBackTextString1
 	call OpenTextbox
-	ld hl, SilentLabP2TextString10
+	ld hl, SilentHillLabBackTextString10
 	call OpenTextbox
-	ld hl, SilentLabP2TextString2
+	ld hl, SilentHillLabBackTextString2
 	call OpenTextbox
 	ld a, 2
 	ld [wMapScriptNumber], a
 	ret
 	
-SilentLabP2Script3: ; 5CFD
-	ld hl, SilentLabP2NPCIDs1
-	ld de, SilentLabP2TextPointers2
+SilentHillLabBackScript3: ; 5CFD
+	ld hl, SilentHillLabBackNPCIDs1
+	ld de, SilentHillLabBackTextPointers2
 	call CallMapTextSubroutine
 	ret
 	
-SilentLabP2RivalChoosePokemon: ; 5D07
+SilentHillLabBackRivalChoosePokemon: ; 5D07
 	ld hl, wJoypadFlags
 	set 4, [hl]
 	ld a, 3
 	call Function17f9
-	ld hl, SilentLabP2MovementPointers
+	ld hl, SilentHillLabBackMovementPointers
 	ld a, [wChosenStarter]
 	ld d, 0
 	ld e, a
@@ -108,27 +108,27 @@ SilentLabP2RivalChoosePokemon: ; 5D07
 	call WriteIntod637
 	ret
 	
-SilentLabP2MovementPointers: ; 5D34
-	dw SilentLabP2Movement2+1
-	dw SilentLabP2Movement2
-	dw SilentLabP2Movement2+2
+SilentHillLabBackMovementPointers: ; 5D34
+	dw SilentHillLabBackMovement2+1
+	dw SilentHillLabBackMovement2
+	dw SilentHillLabBackMovement2+2
 	
-SilentLabP2Movement2: ; 5D3A
+SilentHillLabBackMovement2: ; 5D3A
 	db $0B, $0B, $0B, $0B, $05, $32
 	
-SilentLabP2Script5: ; 5D40
-	ld hl, SilentLabP2TextString12
+SilentHillLabBackScript5: ; 5D40
+	ld hl, SilentHillLabBackTextString12
 	call OpenTextbox
 	ld a, [wd266]
 	ld [wNamedObjectIndexBuffer], a
 	call GetPokemonName
-	ld hl, SilentLabP2TextString13
+	ld hl, SilentHillLabBackTextString13
 	call OpenTextbox
 	ld a, 5
 	ld [wMapScriptNumber], a
 	ret
 	
-SilentLabP2Script6: ; 5D5B
+SilentHillLabBackScript6: ; 5D5B
 	call Function20f8
 	ld hl, wc5ed
 	res 6, [hl]
@@ -136,23 +136,23 @@ SilentLabP2Script6: ; 5D5B
 	ld[wMapScriptNumber], a
 	ret
 	
-SilentLabP2Script7: ; 5D69
-	ld hl, SilentLabP2NPCIDs1
-	ld de, SilentLabP2TextPointers2
+SilentHillLabBackScript7: ; 5D69
+	ld hl, SilentHillLabBackNPCIDs1
+	ld de, SilentHillLabBackTextPointers2
 	call CallMapTextSubroutine
 	ret
 	
-SilentLabP2Text1: ; 5D73
+SilentHillLabBackText1: ; 5D73
 	ld hl, wd41b
 	bit 2, [hl]
-	ld hl, SilentLabP2TextString3
+	ld hl, SilentHillLabBackTextString3
 	jr z, .skip
-	ld hl, SilentLabP2TextString9
+	ld hl, SilentHillLabBackTextString9
 .skip
 	call OpenTextbox
 	ret
 	
-SilentLabP2TextString1: ; 5D84
+SilentHillLabBackTextString1: ; 5D84
 	text "オーキド『ほれ　そこに　３びき"
 	cont "ポケモンが　いる　じゃろう！"
 	cont "ほっほ！"
@@ -162,18 +162,18 @@ SilentLabP2TextString1: ; 5D84
 	cont "⋯⋯　さあ　えらべ！"
 	done
 	
-SilentLabP2TextString2: ; 5DCD
+SilentHillLabBackTextString2: ; 5DCD
 	text "オーキド『まあ"
 	line "あわてるな　<RIVAL>！"
 	cont "おまえも　すきなものを　とれ！"
 	done
 	
-SilentLabP2TextString3: ; 5DEF
+SilentHillLabBackTextString3: ; 5DEF
 	text "オーキド『さあ　<PLAYER>"
 	line "どの　ポケモンに　するかね？"
 	done
 	
-SilentLabP2TextString4: ; 5E1C
+SilentHillLabBackTextString4: ; 5E1C
 	text "オーキド『ほう！　ほのおのポケモン"
 	line "@"
 	ld bc, wStringBuffer1
@@ -183,7 +183,7 @@ SilentLabP2TextString4: ; 5E1C
 	call Function3036
 	ret
 	
-SilentLabP2TextString5: ; 5E32
+SilentHillLabBackTextString5: ; 5E32
 	text "オーキド『ふむ　みずのポケモン"
 	line "@"
 	ld bc, wStringBuffer1
@@ -193,7 +193,7 @@ SilentLabP2TextString5: ; 5E32
 	call Function3036
 	ret
 	
-SilentLabP2TextString6: ; 5E6E
+SilentHillLabBackTextString6: ; 5E6E
 	text "オーキド『おお！　くさのポケモン"
 	line "@"
 	ld bc, wStringBuffer1
@@ -214,7 +214,7 @@ ConfirmPokemonSelection: ; 5E85
 	ld [wd29a], a
 	ld a, 1
 	ld [wd2a0], a
-	ld hl, SilentLabP2TextString8
+	ld hl, SilentHillLabBackTextString8
 	call PrintText
 	ld hl, wJoypadFlags
 	set 5, [hl]
@@ -229,16 +229,16 @@ ConfirmPokemonSelection: ; 5E85
 	ld [wMapScriptNumber], a
 	ret
 .bigJump ; 5EC6
-	ld hl, SilentLabP2TextString7
+	ld hl, SilentHillLabBackTextString7
 	call PrintText 
 	ret
 	
-SilentLabP2TextString7: ; 5ECD
+SilentHillLabBackTextString7: ; 5ECD
 	text "では"
 	line "どれに　するのじゃ？"
 	done
 	
-SilentLabP2TextString8: ; 5EDC
+SilentHillLabBackTextString8: ; 5EDC
 	text "オーキド『この　ポケモンは"
 	line "ほんとに　げんきが　いいぞ！"
 	
@@ -247,53 +247,53 @@ SilentLabP2TextString8: ; 5EDC
 	ld bc, wStringBuffer1
 	text "を　もらった！<PROMPT>"
 	
-SilentLabP2TextString9: ; 5F14
+SilentHillLabBackTextString9: ; 5F14
 	text "オーキド『そうじゃ！"
 	line "やせいの　ポケモンが　でて　きても"
 	cont "そいつを　たたかわせて　いけば"
 	cont "となりまちへ　いける！"
 	done
 	
-SilentLabP2Func3: ; 5F4E
+SilentHillLabBackFunc3: ; 5F4E
 	ld hl, wd41b
 	bit 2, [hl]
-	ld hl, SilentLabP2TextString11
+	ld hl, SilentHillLabBackTextString11
 	jr z, .skip
-	ld hl, SilentLabP2TextString14
+	ld hl, SilentHillLabBackTextString14
 .skip
 	call OpenTextbox
 	ret
 	
-SilentLabP2TextString10: ; 5F5F
+SilentHillLabBackTextString10: ; 5F5F
 	text "<RIVAL>『あッ！　おれにも！"
 	line "じいさん　おれにもくれよう！"
 	done
 	
-SilentLabP2TextString11: ; 5F7B
+SilentHillLabBackTextString11: ; 5F7B
 	text "<RIVAL>『いいぜ　<PLAYER>！"
 	line "さきに　えらんで！"
 	cont "おれは　こころが　ひろいからな"
 	done
 	
-SilentLabP2TextString12: ; 5F9F
+SilentHillLabBackTextString12: ; 5F9F
 	text "<RIVAL>『じゃ　おれは　これ！"
 	done
 	
-SilentLabP2TextString13: ; 5FAD
+SilentHillLabBackTextString13: ; 5FAD
 	text "<RIVAL>は　オーキドから"
 	line "@"
 	ld bc, wStringBuffer1
 	text "を　もらった！"
 	done
 	
-SilentLabP2TextString14: ; 5FC5
+SilentHillLabBackTextString14: ; 5FC5
 	text "<RIVAL>『<PLAYER>の#"
 	line "いいなあ！"
 	cont "でも　おれのポケモンも"
 	cont "ちょっと　いいだろ？"
 	done
 	
-SilentLabP2Func4: ; 5FE9
+SilentHillLabBackFunc4: ; 5FE9
 	ld hl, wd41b
 	bit 2, [hl]
 	jr nz, .bigjump
@@ -302,7 +302,7 @@ SilentLabP2Func4: ; 5FE9
 	ld [wChosenStarter], a
 	ld d, 0
 	ld e, a
-	ld hl, SilentLabP2StarterData
+	ld hl, SilentHillLabBackStarterData
 	add hl, de
 	add hl, de
 	add hl, de
@@ -328,11 +328,11 @@ SilentLabP2Func4: ; 5FE9
 	ld [wd266], a
 	ret
 .bigjump
-	ld hl, SilentLabP2TextString15
+	ld hl, SilentHillLabBackTextString15
 	call OpenTextbox
 	ret
 	
-SilentLabP2StarterData: ; 6031
+SilentHillLabBackStarterData: ; 6031
 	db DEX_HONOGUMA 
 	dw $5E09 
 	db DEX_KURUSU 
@@ -345,12 +345,12 @@ SilentLabP2StarterData: ; 6031
 	dw $5E5C 
 	db DEX_HONOGUMA
 	
-SilentLabP2TextString15: ; 603D
+SilentHillLabBackTextString15: ; 603D
 	text "オーキド『これ！"
 	line "よくばっちゃ　いかん！"
 	done
 	
-SilentLabP2TextPointers2: ; 6053
+SilentHillLabBackTextPointers2: ; 6053
 	dw Function3899 
 	dw Function3899
 	dw Function3899
diff --git a/maps/SilentLabP1.asm b/maps/SilentHillLabFront.asm
index 6588e01..62a477a 100644
--- a/maps/SilentLabP1.asm
+++ b/maps/SilentHillLabFront.asm
@@ -1,95 +1,95 @@
 include "constants.asm"
 
-SECTION "maps/SilentLabP1.asm", ROMX
+SECTION "Silent Lab P1", ROMX[$4BBC], BANK[$34]
 
-SilentLabP1ScriptLoader:: ; 4BBC
-	ld hl, SilentLabP1ScriptPointers
+SilentHillLabFrontScriptLoader:: ; 4BBC
+	ld hl, SilentHillLabFrontScriptPointers
 	call RunMapScript
 	call WriteBackMapScriptNumber
 	ret
 	
-SilentLabP1ScriptPointers: ; 4BC6
-	dw SilentLabP1Script1 
-	dw SilentLabP1NPCIDs1 
+SilentHillLabFrontScriptPointers: ; 4BC6
+	dw SilentHillLabFrontScript1 
+	dw SilentHillLabFrontNPCIDs1 
 	
-	dw SilentLabP1Script2 
-	dw SilentLabP1NPCIDs2 
+	dw SilentHillLabFrontScript2 
+	dw SilentHillLabFrontNPCIDs2 
 	
-	dw SilentLabP1Script3 
-	dw SilentLabP1NPCIDs2 
+	dw SilentHillLabFrontScript3 
+	dw SilentHillLabFrontNPCIDs2 
 	
-	dw SilentLabP1Script4 
-	dw SilentLabP1NPCIDs2 
+	dw SilentHillLabFrontScript4 
+	dw SilentHillLabFrontNPCIDs2 
 	
-	dw SilentLabP1Conversation1 
-	dw SilentLabP1NPCIDs2 
+	dw SilentHillLabFrontConversation1 
+	dw SilentHillLabFrontNPCIDs2 
 	
-	dw SilentLabP1Script6 
-	dw SilentLabP1NPCIDs3 
+	dw SilentHillLabFrontScript6 
+	dw SilentHillLabFrontNPCIDs3 
 	
-	dw SilentLabP1Script7 
-	dw SilentLabP1NPCIDs4 
+	dw SilentHillLabFrontScript7 
+	dw SilentHillLabFrontNPCIDs4 
 	
-	dw SilentLabP1Script8 
-	dw SilentLabP1NPCIDs5 
+	dw SilentHillLabFrontScript8 
+	dw SilentHillLabFrontNPCIDs5 
 	
-	dw SilentLabP1Script9 
-	dw SilentLabP1NPCIDs5 
+	dw SilentHillLabFrontScript9 
+	dw SilentHillLabFrontNPCIDs5 
 	
-	dw SilentLabP1Script10 
-	dw SilentLabP1NPCIDs5 
+	dw SilentHillLabFrontScript10 
+	dw SilentHillLabFrontNPCIDs5 
 	
-	dw SilentLabP1Script11 
-	dw SilentLabP1NPCIDs5 
+	dw SilentHillLabFrontScript11 
+	dw SilentHillLabFrontNPCIDs5 
 	
-	dw SilentLabP1Script12 
-	dw SilentLabP1NPCIDs6 
+	dw SilentHillLabFrontScript12 
+	dw SilentHillLabFrontNPCIDs6 
 	
-	dw SilentLabP1Script13 
-	dw SilentLabP1NPCIDs6 
+	dw SilentHillLabFrontScript13 
+	dw SilentHillLabFrontNPCIDs6 
 	
-	dw SilentLabP1Script14 
-	dw SilentLabP1NPCIDs6 
+	dw SilentHillLabFrontScript14 
+	dw SilentHillLabFrontNPCIDs6 
 	
-	dw SilentLabP1Script15 
-	dw SilentLabP1NPCIDs7 
+	dw SilentHillLabFrontScript15 
+	dw SilentHillLabFrontNPCIDs7 
 	
-	dw SilentLabP1Script16 
-	dw SilentLabP1NPCIDs7 
+	dw SilentHillLabFrontScript16 
+	dw SilentHillLabFrontNPCIDs7 
 	
-	dw SilentLabP1Script17 
-	dw SilentLabP1NPCIDs7 
+	dw SilentHillLabFrontScript17 
+	dw SilentHillLabFrontNPCIDs7 
 	
-	dw SilentLabP1Script18 
-	dw SilentLabP1NPCIDs7 
+	dw SilentHillLabFrontScript18 
+	dw SilentHillLabFrontNPCIDs7 
 	
-	dw SilentLabP1Script19 
-	dw SilentLabP1NPCIDs9 
+	dw SilentHillLabFrontScript19 
+	dw SilentHillLabFrontNPCIDs9 
 	
-SilentLabP1NPCIDs1: ; 4C12
+SilentHillLabFrontNPCIDs1: ; 4C12
 	db $02
 	db $09 
 	db $0A 
 	db $FF 
-SilentLabP1NPCIDs2: ; 4C16
+SilentHillLabFrontNPCIDs2: ; 4C16
 	db $00 
 	db $02 
 	db $04 
 	db $09 
 	db $0A 
 	db $FF 
-SilentLabP1NPCIDs3: ; 4C1C
+SilentHillLabFrontNPCIDs3: ; 4C1C
 	db $02 
 	db $04 
 	db $09 
 	db $0A 
 	db $FF 
-SilentLabP1NPCIDs4: ; 4C21
+SilentHillLabFrontNPCIDs4: ; 4C21
 	db $04 
 	db $09 
 	db $0A 
 	db $FF 
-SilentLabP1NPCIDs5: ; 4C25
+SilentHillLabFrontNPCIDs5: ; 4C25
 	db $01 
 	db $03 
 	db $05 
@@ -99,7 +99,7 @@ SilentLabP1NPCIDs5: ; 4C25
 	db $09 
 	db $0A 
 	db $FF 
-SilentLabP1NPCIDs6: ; 4C2E
+SilentHillLabFrontNPCIDs6: ; 4C2E
 	db $01 
 	db $03 
 	db $05 
@@ -107,14 +107,14 @@ SilentLabP1NPCIDs6: ; 4C2E
 	db $07 
 	db $08 
 	db $FF 
-SilentLabP1NPCIDs7: ; 4C35
+SilentHillLabFrontNPCIDs7: ; 4C35
 	db $00 
 	db $05 
 	db $06 
 	db $07 
 	db $08 
 	db $FF 
-SilentLabP1NPCIDs8: ; 4C3B (unused?)
+SilentHillLabFrontNPCIDs8: ; 4C3B (unused?)
 	db $00 
 	db $03 
 	db $05 
@@ -124,34 +124,34 @@ SilentLabP1NPCIDs8: ; 4C3B (unused?)
 	db $09 
 	db $0A 
 	db $FF 
-SilentLabP1NPCIDs9: ; 4C44
+SilentHillLabFrontNPCIDs9: ; 4C44
 	db $00 
 	db $07 
 	db $08 
 	db $FF
 	
-SilentLabP1TextPointers1:: ; 4C48
-	dw SilentLabP1Text4 
-	dw SilentLabP1Text7 
-	dw SilentLabP1Text10 
-	dw SilentLabP1Text11 
-	dw SilentLabP1TextString20 
-	dw SilentLabP1Text12 
-	dw SilentLabP1Text13 
-	dw SilentLabP1Text14 
-	dw SilentLabP1Text15 
-	dw SilentLabP1Text16 
-	dw SilentLabP1Text16 
-	
-SilentLabP1Script1: ; 4C5E
-	call SilentLabP1MoveDown
+SilentHillLabFrontTextPointers:: ; 4C48
+	dw SilentHillLabFrontText4 
+	dw SilentHillLabFrontText7 
+	dw SilentHillLabFrontText10 
+	dw SilentHillLabFrontText11 
+	dw SilentHillLabFrontTextString20 
+	dw SilentHillLabFrontText12 
+	dw SilentHillLabFrontText13 
+	dw SilentHillLabFrontText14 
+	dw SilentHillLabFrontText15 
+	dw SilentHillLabFrontText16 
+	dw SilentHillLabFrontText16 
+	
+SilentHillLabFrontScript1: ; 4C5E
+	call SilentHillLabFrontMoveDown
 	ret z
-	ld hl, SilentLabP1NPCIDs1
-	ld de, SilentLabP1TextPointers2
+	ld hl, SilentHillLabFrontNPCIDs1
+	ld de, SilentHillLabFrontTextPointers2
 	call CallMapTextSubroutine
 	ret
 	
-SilentLabP1MoveDown: ; 4C6C
+SilentHillLabFrontMoveDown: ; 4C6C
 	ld a, [wXCoord]
 	cp 4
 	ret nz
@@ -161,13 +161,13 @@ SilentLabP1MoveDown: ; 4C6C
 	ldh a, [hJoyState]
 	bit 6, a
 	jp z, SetFFInAccumulator
-	call SilentLabP1Text3
+	call SilentHillLabFrontText3
 	ld hl, wJoypadFlags
 	set 4, [hl]
 	ld a, 0
 	call Function17f9
 	ld a, 0
-	ld hl, SilentLabP1Movement1
+	ld hl, SilentHillLabFrontMovement1
 	call LoadMovementDataPointer
 	ld hl, wc5ed
 	set 7, [hl]
@@ -176,15 +176,15 @@ SilentLabP1MoveDown: ; 4C6C
 	call ClearAccumulator
 	ret
 	
-SilentLabP1Movement1: ; 4CA2
+SilentHillLabFrontMovement1: ; 4CA2
 	db $06, $32
 	
-SilentLabP1Script2: ; 4CA4
+SilentHillLabFrontScript2: ; 4CA4
 	ld a, 2
 	ld [wMapScriptNumber], a
 	ret
 	
-SilentLabP1Script3: ; 4CAA
+SilentHillLabFrontScript3: ; 4CAA
 	ld a, 6
 	call Function17f9
 	ld a, 0
@@ -192,7 +192,7 @@ SilentLabP1Script3: ; 4CAA
 	ld b, 6
 	ld c, 0
 	call StartFollow
-	ld hl, SilentLabP1Movement2
+	ld hl, SilentHillLabFrontMovement2
 	ld a, 6
 	call LoadMovementDataPointer
 	ld hl, wc5ed
@@ -203,47 +203,47 @@ SilentLabP1Script3: ; 4CAA
 	call WriteIntod637
 	ret
 	
-SilentLabP1Movement2: ; 4CD3
+SilentHillLabFrontMovement2: ; 4CD3
 	db 09, 09, 09, 09, 09, 09, 09, 09, 09, 05, 07, 01, $32
 	
-SilentLabP1Script4: ; 4CE0
+SilentHillLabFrontScript4: ; 4CE0
 	call Function1828
 	ld a, 4
 	ld [wMapScriptNumber], a 
 	ret
 	
-SilentLabP1Conversation1: ; 4CE9
+SilentHillLabFrontConversation1: ; 4CE9
 	ld a, 4
 	ld d, RIGHT
 	call SetObjectFacing
-	ld hl, SilentLabP1TextString20
+	ld hl, SilentHillLabFrontTextString20
 	call OpenTextbox
-	ld hl, SilentLabP1TextString4
+	ld hl, SilentHillLabFrontTextString4
 	call OpenTextbox
 	ld a, 4
 	ld d, UP
 	call SetObjectFacing
-	ld hl, SilentLabP1TextString28
+	ld hl, SilentHillLabFrontTextString28
 	call OpenTextbox
-	ld hl, SilentLabP1TextString5
+	ld hl, SilentHillLabFrontTextString5
 	call OpenTextbox
 	ld a, 4
 	ld d, RIGHT
 	call SetObjectFacing
-	ld hl, SilentLabP1TextString29
+	ld hl, SilentHillLabFrontTextString29
 	call OpenTextbox
-	ld hl, SilentLabP1TextString7
+	ld hl, SilentHillLabFrontTextString7
 	call OpenTextbox
-	call SilentLabP1Script5
+	call SilentHillLabFrontScript5
 	ret
 	
-SilentLabP1Script5: ; 4D26
+SilentHillLabFrontScript5: ; 4D26
 	ld hl, wJoypadFlags
 	set 4, [hl]
 	ld a, 2
 	call Function17f9
 	ld a, 2
-	ld hl, SilentLabP1Movement3
+	ld hl, SilentHillLabFrontMovement3
 	call LoadMovementDataPointer
 	ld hl, wc5ed
 	set 7, [hl]
@@ -253,16 +253,16 @@ SilentLabP1Script5: ; 4D26
 	call WriteIntod637
 	ret
 	
-SilentLabP1Movement3: ; 4D48
+SilentHillLabFrontMovement3: ; 4D48
 	db 9, 5, $33
 	
-SilentLabP1Script6: ; 4D4B
+SilentHillLabFrontScript6: ; 4D4B
 	ld hl, wJoypadFlags
 	set 4, [hl]
 	ld a, 4
 	call Function17f9
 	ld a, 4
-	ld hl, SilentLabP1Movement4
+	ld hl, SilentHillLabFrontMovement4
 	call LoadMovementDataPointer
 	ld hl, wc5ed
 	set 7, [hl]
@@ -272,16 +272,16 @@ SilentLabP1Script6: ; 4D4B
 	call WriteIntod637
 	ret
 
-SilentLabP1Movement4: ; 4D6D
+SilentHillLabFrontMovement4: ; 4D6D
 	db $0D, $0D, $0F, $0D, $0D, $33
 	
-SilentLabP1Script7: ; 4D73
+SilentHillLabFrontScript7: ; 4D73
 	ld hl, wJoypadFlags
 	set 4, [hl]
 	ld a, 0
 	call Function17f9
 	ld a, 0
-	ld hl, SilentLabP1Movement5
+	ld hl, SilentHillLabFrontMovement5
 	call LoadMovementDataPointer
 	ld hl, wc5ed
 	set 7, [hl]
@@ -291,10 +291,10 @@ SilentLabP1Script7: ; 4D73
 	call WriteIntod637
 	ret
 	
-SilentLabP1Movement5: ; 4D95
+SilentHillLabFrontMovement5: ; 4D95
 	db 09, 09, 09, 05, $32
 	
-SilentLabP1Script8: ; 4D9A
+SilentHillLabFrontScript8: ; 4D9A
 	ld a, 3
 	call Function1989
 	ld a, 5
@@ -304,7 +304,7 @@ SilentLabP1Script8: ; 4D9A
 	ld a, 0 
 	call Function17f9 
 	ld a, 0 
-	ld hl, SilentLabP1Movement6
+	ld hl, SilentHillLabFrontMovement6
 	call LoadMovementDataPointer
 	ld hl, wc5ed
 	set 7, [hl]
@@ -314,10 +314,10 @@ SilentLabP1Script8: ; 4D9A
 	call WriteIntod637
 	ret
 	
-SilentLabP1Movement6: ; 4DC6
+SilentHillLabFrontMovement6: ; 4DC6
 	db 8, 8, 8, $0A, 6, $32
 	
-SilentLabP1Script9: ; 4DCC
+SilentHillLabFrontScript9: ; 4DCC
 	ld hl, wJoypadFlags
 	set 4, [hl]
 	ld a, 5
@@ -325,7 +325,7 @@ SilentLabP1Script9: ; 4DCC
 	ld a, 5
 	call Function197e
 	ld a, 5
-	ld hl, SilentLabP1Movement7
+	ld hl, SilentHillLabFrontMovement7
 	call LoadMovementDataPointer
 	ld hl, wc5ed
 	set 7, [hl]
@@ -335,14 +335,14 @@ SilentLabP1Script9: ; 4DCC
 	call WriteIntod637
 	ret
 	
-SilentLabP1Movement7: ; 4DF3
+SilentHillLabFrontMovement7: ; 4DF3
 	db $08, $08, $08, $08, $0A, $06, $32
 	
-SilentLabP1Script10: ; 4DFA
+SilentHillLabFrontScript10: ; 4DFA
 	ld a, 5
 	ld d, RIGHT
 	call SetObjectFacing
-	ld hl, SilentLabP1TextString21
+	ld hl, SilentHillLabFrontTextString21
 	call OpenTextbox
 	ld hl, wJoypadFlags
 	set 4, [hl]
@@ -357,7 +357,7 @@ SilentLabP1Script10: ; 4DFA
 	ld a, 3
 	call Function197e
 	ld a, 3
-	ld hl, SilentLabP1Movement8
+	ld hl, SilentHillLabFrontMovement8
 	call LoadMovementDataPointer
 	ld hl, wc5ed
 	set 7, [hl]
@@ -367,21 +367,21 @@ SilentLabP1Script10: ; 4DFA
 	call WriteIntod637
 	ret
 	
-SilentLabP1Movement8: ; 4E3C
+SilentHillLabFrontMovement8: ; 4E3C
 	db $08, $04, $32
 	
-SilentLabP1Script11: ; 4E3F
-	ld hl, SilentLabP1TextString8
+SilentHillLabFrontScript11: ; 4E3F
+	ld hl, SilentHillLabFrontTextString8
 	call OpenTextbox
-	ld hl, SilentLabP1TextString9
+	ld hl, SilentHillLabFrontTextString9
 	call OpenTextbox
 	ld a, $0B
 	call Function1617
 	ld a, $0C
 	call Function1617
-	ld hl, SilentLabP1TextString10
+	ld hl, SilentHillLabFrontTextString10
 	call OpenTextbox
-	ld hl, SilentLabP1TextString15
+	ld hl, SilentHillLabFrontTextString15
 	call OpenTextbox
 	ld hl, wd41c
 	set 4, [hl]
@@ -391,27 +391,27 @@ SilentLabP1Script11: ; 4E3F
 	call InitUnknownBuffercc9e
 	ret
 	
-SilentLabP1Script12: ; 4E72
-	call SilentLabP1MoveDown
+SilentHillLabFrontScript12: ; 4E72
+	call SilentHillLabFrontMoveDown
 	ret z
-	call SilentLabP1RivalMovePokemon
+	call SilentHillLabFrontRivalMovePokemon
 	ret z
-	ld hl, SilentLabP1NPCIDs6
-	ld de, SilentLabP1TextPointers2
+	ld hl, SilentHillLabFrontNPCIDs6
+	ld de, SilentHillLabFrontTextPointers2
 	call CallMapTextSubroutine
 	ret
 	
-SilentLabP1RivalMovePokemon: ; 4E84
+SilentHillLabFrontRivalMovePokemon: ; 4E84
 	ld a, [wYCoord]
 	cp 8
 	ret nz
-	ld hl, SilentLabP1Movement9
+	ld hl, SilentHillLabFrontMovement9
 	ld a, [wXCoord]
 	cp 3
 	jr z, .jump
 	cp 4
 	ret nz
-	ld hl, SilentLabP1Movement10
+	ld hl, SilentHillLabFrontMovement10
 .jump	
 	push hl
 	ld hl, wJoypadFlags
@@ -430,14 +430,14 @@ SilentLabP1RivalMovePokemon: ; 4E84
 	call ClearAccumulator
 	ret
 	
-SilentLabP1Movement9: ; 4EDE
+SilentHillLabFrontMovement9: ; 4EDE
 	db $08, $0B, $0B, $08, $08, $04, $32
 	
-SilentLabP1Movement10: ; 4EC5
+SilentHillLabFrontMovement10: ; 4EC5
 	db $08, $0B, $08, $08, $04, $32
 	
-SilentLabP1Script13: ; 4ECB
-	ld hl, SilentLabP1TextString17
+SilentHillLabFrontScript13: ; 4ECB
+	ld hl, SilentHillLabFrontTextString17
 	call OpenTextbox
 	call GetLabPokemon
 	ld hl, wc5ed
@@ -474,12 +474,12 @@ LabPokemon: ; 4EFF
 	db DEX_HONOGUMA 
 	db 3 
 	
-SilentLabP1Script14: ; 4F05
-	ld hl, SilentLabP1TextString19
+SilentHillLabFrontScript14: ; 4F05
+	ld hl, SilentHillLabFrontTextString19
 	ld a, [wcd5d]
 	and a
 	jr nz, .skip
-	ld hl, SilentLabP1TextString18
+	ld hl, SilentHillLabFrontTextString18
 .skip
 	call OpenTextbox
 	ld hl, wJoypadFlags
@@ -487,7 +487,7 @@ SilentLabP1Script14: ; 4F05
 	ld a, 5
 	call Function17f9
 	ld a, 5
-	ld hl, SilentLabP1Movement11
+	ld hl, SilentHillLabFrontMovement11
 	call LoadMovementDataPointer
 	ld hl, wc5ed
 	set 7, [hl]
@@ -497,27 +497,27 @@ SilentLabP1Script14: ; 4F05
 	call WriteIntod637
 	ret
 	
-SilentLabP1Movement11: ; 4F36
+SilentHillLabFrontMovement11: ; 4F36
 	db $04, $08, $08, $08, $33
 	
-SilentLabP1Script15: ; 4F3B
+SilentHillLabFrontScript15: ; 4F3B
 	call Function20f8
 	ld a, $0F
 	ld [wMapScriptNumber], a
 	call InitUnknownBuffercc9e
 	ret
 	
-SilentLabP1Script16: ; 4F47
-	call SilentLabP1MoveDown
+SilentHillLabFrontScript16: ; 4F47
+	call SilentHillLabFrontMoveDown
 	ret z
-	call SilentLabP1MoveRivalLeave
+	call SilentHillLabFrontMoveRivalLeave
 	ret z
-	ld hl, SilentLabP1NPCIDs7
-	ld de, SilentLabP1TextPointers2
+	ld hl, SilentHillLabFrontNPCIDs7
+	ld de, SilentHillLabFrontTextPointers2
 	call CallMapTextSubroutine
 	ret
 	
-SilentLabP1MoveRivalLeave: ; 4F59
+SilentHillLabFrontMoveRivalLeave: ; 4F59
 	ld a, [wYCoord]
 	cp $0B
 	ret nz
@@ -549,8 +549,8 @@ SilentLabP1MoveRivalLeave: ; 4F59
 Movememt12:; 4F93
 	db $07, $07, $07, $05, $32
 	
-SilentLabP1Script17: ; 4F98
-	ld hl, SilentLabP1TextString23
+SilentHillLabFrontScript17: ; 4F98
+	ld hl, SilentHillLabFrontTextString23
 	call OpenTextbox
 	ld hl, wd41d
 	set 2, [hl]
@@ -565,25 +565,25 @@ SilentLabP1Script17: ; 4F98
 	ld [wMapScriptNumber], a
 	ret
 	
-SilentLabP1Script18: ; 4FBC
-	call SilentLabP1MoveDown
+SilentHillLabFrontScript18: ; 4FBC
+	call SilentHillLabFrontMoveDown
 	ret z
-	ld hl, SilentLabP1NPCIDs7
-	ld de, SilentLabP1TextPointers2
+	ld hl, SilentHillLabFrontNPCIDs7
+	ld de, SilentHillLabFrontTextPointers2
 	call CallMapTextSubroutine
 	ret
 	
-SilentLabP1Script19: ; 4FCA
-	call SilentLabP1MoveDown
+SilentHillLabFrontScript19: ; 4FCA
+	call SilentHillLabFrontMoveDown
 	ret z
-	ld hl, SilentLabP1NPCIDs9
-	ld de, SilentLabP1TextPointers2
+	ld hl, SilentHillLabFrontNPCIDs9
+	ld de, SilentHillLabFrontTextPointers2
 	call CallMapTextSubroutine
 	ret
 	
-SilentLabP1TextPointers2: ; 4FD8
-	dw SilentLabP1Text1
-	dw SilentLabP1Text2 
+SilentHillLabFrontTextPointers2: ; 4FD8
+	dw SilentHillLabFrontText1
+	dw SilentHillLabFrontText2 
 	dw Function3899 
 	dw Function3899 
 	dw Function3899 
@@ -596,14 +596,14 @@ SilentLabP1TextPointers2: ; 4FD8
 	dw Function3899 
 	dw Function3899 
 	dw Function3899 
-	dw SilentLabP1Text3 
+	dw SilentHillLabFrontText3 
 	
-SilentLabP1Text1: ; 4FF6
-	ld hl, SilentLabP1TextString1
+SilentHillLabFrontText1: ; 4FF6
+	ld hl, SilentHillLabFrontTextString1
 	call OpenTextbox
 	ret
 	
-SilentLabP1TextString1: ; 4FFD
+SilentHillLabFrontTextString1: ; 4FFD
 	text "パソコンを　みると"
 	line "なんと　メールが　きていた！"
 	
@@ -626,52 +626,52 @@ SilentLabP1TextString1: ; 4FFD
 	cont "<⋯⋯>　<⋯⋯>　<⋯⋯>じょしゅより"
 	done
 	
-SilentLabP1Text2: ; 50B3
+SilentHillLabFrontText2: ; 50B3
 	ld hl, wd39d
 	bit 0, [hl]
 	set 0, [hl]
 	jr z, .jump
 	res 0, [hl]
-	ld hl, SilentLabP1TextString2A
+	ld hl, SilentHillLabFrontTextString2A
 	jr .skip
 .jump
-	ld hl, SilentLabP1TextString2B
+	ld hl, SilentHillLabFrontTextString2B
 .skip
 	call OpenTextbox
 	ret
 	
-SilentLabP1TextString2A: ; 50CA
+SilentHillLabFrontTextString2A: ; 50CA
 	text "スタート　ボタンを　プシュ！"
 	line "おすと　メニューが　ひらくなり"
 	done
 	
-SilentLabP1TextString2B: ; 50EA
+SilentHillLabFrontTextString2B: ; 50EA
 	text "セーブするには　#　レポート"
 	line "こまめに　かくと　いいなり"
 	done
 	
-SilentLabP1Text3: ; 5108
-	ld hl, SilentLabP1TextString3
+SilentHillLabFrontText3: ; 5108
+	ld hl, SilentHillLabFrontTextString3
 	call OpenTextbox
 	ret
 	
-SilentLabP1TextString3: ; 510F
+SilentHillLabFrontTextString3: ; 510F
 	text "カギが　かかっている"
 	done
 	
-SilentLabP1Text4: ; 511B
+SilentHillLabFrontText4: ; 511B
 	ld a, [wMapScriptNumber]
 	cp $0E
-	jp nc, SilentLabP1Text7
-	ld hl, SilentLabP1TextString4
+	jp nc, SilentHillLabFrontText7
+	ld hl, SilentHillLabFrontTextString4
 	call OpenTextbox
 	ret
 	
-SilentLabP1TextString4: ; 512A
+SilentHillLabFrontTextString4: ; 512A
 	text "オーキド『ごくろうさん！"
 	done
 	
-SilentLabP1TextString5: ; 5138
+SilentHillLabFrontTextString5: ; 5138
 	text "オーキド『そうとも！"
 	line "わしが　オーキドじゃ！"
 	cont "じじいで　わるかったな！"
@@ -683,23 +683,23 @@ SilentLabP1TextString5: ; 5138
 	line "きいては　くれんか？@"
 	db $08
 	
-SilentLabP1Text6: ; 5192
+SilentHillLabFrontText6: ; 5192
 	call YesNoBox
 	jr c, .jump
 .loop
-	ld hl, SilentLabP1TextString6A
+	ld hl, SilentHillLabFrontTextString6A
 	call PrintText
 	call Function3036
 	ret
 
 .jump
-	ld hl, SilentLabP1TextString6B
+	ld hl, SilentHillLabFrontTextString6B
 	call PrintText
 	call YesNoBox
 	jr c, .jump
 	jr .loop
 	
-SilentLabP1TextString6A: ; 51AE
+SilentHillLabFrontTextString6A: ; 51AE
 	text "オーキド『いまから　１ねんまえ"
 	line "わしは　カントーで"
 	cont "きみたちの　ような　しょうねんに"
@@ -740,7 +740,7 @@ SilentLabP1TextString6A: ; 51AE
 	cont "ちからを　かして　くれんか！"
 	done
 	
-SilentLabP1TextString6B: ; 5332
+SilentHillLabFrontTextString6B: ; 5332
 	text "オーキド『そうか<⋯⋯>"
 	line "わしに　ひとを　みるめが"
 	cont "なかったと　いうことじゃな<⋯⋯>"
@@ -753,36 +753,36 @@ SilentLabP1TextString6B: ; 5332
 	cont "わしの　はなしを　きいてくれるな？"
 	done
 	
-SilentLabP1TextString7: ; 538D
+SilentHillLabFrontTextString7: ; 538D
 	text "オーキド『ふたりとも！"
 	line "ちょっと　わしに　ついてこい！"
 	done
 	
-SilentLabP1Text7: ; 53AA
+SilentHillLabFrontText7: ; 53AA
 	ld a, [wMapScriptNumber]
 	cp $12
 	jr z, .jump
-	ld hl, SilentLabP1TextString11A
+	ld hl, SilentHillLabFrontTextString11A
 	call OpenTextbox
 	ret
 
 .jump	
-	ld hl, SilentLabP1TextString11B
+	ld hl, SilentHillLabFrontTextString11B
 	call OpenTextbox
 	ret
 	
-SilentLabP1TextString8: ; 53BF
+SilentHillLabFrontTextString8: ; 53BF
 	text "オーキド『<PLAYER>！<RIVAL>！"
 	line "このずかんを"
 	cont "おまえたちに　あずける！"
 	done
 	
-SilentLabP1TextString9: ; 53DE
+SilentHillLabFrontTextString9: ; 53DE
 	text "<PLAYER>は　オーキドから"
 	line "#ずかんを　もらった！"
 	done
 	
-SilentLabP1TextString10: ; 53F5
+SilentHillLabFrontTextString10: ; 53F5
 	text "オーキド『この　せかいの　すべての"
 	line "#を　きろくした"
 	cont "かんぺきな　ずかんを　つくること！"
@@ -804,13 +804,13 @@ SilentLabP1TextString10: ; 53F5
 	cont "いだいな　しごとじゃー！"
 	done
 	
-SilentLabP1TextString11A: ; 54C3
+SilentHillLabFrontTextString11A: ; 54C3
 	text "オーキド『せかい　じゅうの"
 	line "#たちが"
 	cont "<PLAYER>を　まって　おるぞー"
 	done
 	
-SilentLabP1TextString11B: ; 54E3
+SilentHillLabFrontTextString11B: ; 54E3
 	text "オーキド『おう！　<PLAYER>"
 	line "どうだ？"
 	cont "わしの　あげた　#は<⋯⋯>？"
@@ -827,12 +827,12 @@ SilentLabP1TextString11B: ; 54E3
 	line "きに　なるからな"
 	done
 	
-SilentLabP1Text8: ; 5560
-	ld hl, SilentLabP1TextString12
+SilentHillLabFrontText8: ; 5560
+	ld hl, SilentHillLabFrontTextString12
 	call OpenTextbox
 	ret
 	
-SilentLabP1TextString12: ; 5567
+SilentHillLabFrontTextString12: ; 5567
 	text "オーキド『よく　きたな！"
 	line "#ずかんの"
 	cont "ちょうしは　どうかな？"
@@ -841,12 +841,12 @@ SilentLabP1TextString12: ; 5567
 	cont "みて　あげようか！"
 	done
 	
-SilentLabP1Text9: ; 559A
-	ld hl, SilentLabP1TextString13
+SilentHillLabFrontText9: ; 559A
+	ld hl, SilentHillLabFrontTextString13
 	call OpenTextbox
 	ret
 	
-SilentLabP1TextString13: ; 55A1
+SilentHillLabFrontTextString13: ; 55A1
 	text "オーキド『<⋯⋯>　おっほんッ！"
 	line "よくやったな　<PLAYER>！"
 	
@@ -865,12 +865,12 @@ SilentLabP1TextString13: ; 55A1
 	cont "<RIVAL>『ギクッ！"
 	done
 	
-SilentLabP1Text10: ; 561A
-	ld hl, SilentLabP1TextString14
+SilentHillLabFrontText10: ; 561A
+	ld hl, SilentHillLabFrontTextString14
 	call OpenTextbox
 	ret
 	
-SilentLabP1TextString14: ; 5621
+SilentHillLabFrontTextString14: ; 5621
 	text "<RIVAL>『なんだ"
 	line "<PLAYER>じゃないか！"
 	cont "おれも　ここが"
@@ -878,23 +878,23 @@ SilentLabP1TextString14: ; 5621
 	cont "だれも　いないみたいだな<⋯⋯>"
 	done
 	
-SilentLabP1Text11: ; 5658
-	ld hl, SilentLabP1TextString16
+SilentHillLabFrontText11: ; 5658
+	ld hl, SilentHillLabFrontTextString16
 	call OpenTextbox
 	ret
 	
-SilentLabP1TextString15: ; 565F
+SilentHillLabFrontTextString15: ; 565F
 	text "<RIVAL>『よっしゃあ！"
 	line "じいさん！　おれにまかせな！"
 	done
 	
-SilentLabP1TextString16: ; 5678
+SilentHillLabFrontTextString16: ; 5678
 	text "<RIVAL>『おれが　えらんだ"
 	line "#のほうが　つよそうだぜ！"
 	cont "こっちに　したかったんじゃないの？"
 	done
 	
-SilentLabP1TextString17: ; 56A4
+SilentHillLabFrontTextString17: ; 56A4
 	text "<RIVAL>『<PLAYER>！"
 	line "せっかく　じいさんに"
 	cont "#　もらったんだから"
@@ -902,12 +902,12 @@ SilentLabP1TextString17: ; 56A4
 	cont "たたかわせて　みようぜ！"
 	done
 	
-SilentLabP1TextString18: ; 56D4
+SilentHillLabFrontTextString18: ; 56D4
 	text "<RIVAL>『くっそー！"
 	line "こんどは　ぜったい　まけないぞ！"
 	done
 	
-SilentLabP1TextString19: ; 56EE
+SilentHillLabFrontTextString19: ; 56EE
 	text "<RIVAL>『よーし！"
 	line "ほかの　#と　たたかわせて"
 	cont "もっと　もっと　つよくしよう！"
@@ -915,12 +915,12 @@ SilentLabP1TextString19: ; 56EE
 	para "そんじゃ　ばいばい！"
 	done
 	
-SilentLabP1TextString20: ; 571F
+SilentHillLabFrontTextString20: ; 571F
 	text "じいちゃん！"
 	line "つれてきたよー！"
 	done
 	
-SilentLabP1TextString21: ; 5730
+SilentHillLabFrontTextString21: ; 5730
 	text "ぼくは　かつて"
 	line "#トレーナーの　ちょうてんを"
 	cont "めざしたことが　あるんだ"
@@ -944,23 +944,23 @@ SilentLabP1TextString21: ; 5730
 	cont "とても　ハイテクな　ずかん　だよ！"
 	done
 	
-SilentLabP1Text12: ; 5814
-	ld hl, SilentLabP1TextString22
+SilentHillLabFrontText12: ; 5814
+	ld hl, SilentHillLabFrontTextString22
 	call OpenTextbox
 	ret
 	
-SilentLabP1TextString22: ; 581B
+SilentHillLabFrontTextString22: ; 581B
 	text "ぼくも　むかし　やったけど"
 	line "なかなか　たいへんだよ<⋯⋯>"
 	cont "がんばってね！"
 	done
 	
-SilentLabP1Text13: ; 583F
-	ld hl, SilentLabP1TextString24
+SilentHillLabFrontText13: ; 583F
+	ld hl, SilentHillLabFrontTextString24
 	call OpenTextbox
 	ret
 	
-SilentLabP1TextString23: ; 5846
+SilentHillLabFrontTextString23: ; 5846
 	text "ナナミ『さっき　あなたを　"
 	line "つれてきた　わかい　おとこのこ<⋯⋯>"
 	cont "あれは　わたしの　おとうとなの"
@@ -1008,17 +1008,17 @@ SilentLabP1TextString23: ; 5846
 	line "いのっているわ"
 	done
 	
-SilentLabP1TextString24: ; 5A23
+SilentHillLabFrontTextString24: ; 5A23
 	text "<⋯⋯>あなたの　かつやく"
 	line "いのってるわ"
 	done
 	
-SilentLabP1Text14: ; 5A36
-	ld hl, SilentLabP1TextString25
+SilentHillLabFrontText14: ; 5A36
+	ld hl, SilentHillLabFrontTextString25
 	call OpenTextbox
 	ret
 	
-SilentLabP1TextString25: ; 5A3D
+SilentHillLabFrontTextString25: ; 5A3D
 	text "わたしは"
 	line "はかせの　じょしゅ　です"
 	
@@ -1030,12 +1030,12 @@ SilentLabP1TextString25: ; 5A3D
 	cont "なるような　きがします"
 	done
 	
-SilentLabP1Text15: ; 5A90
-	ld hl, SilentLabP1TextString26
+SilentHillLabFrontText15: ; 5A90
+	ld hl, SilentHillLabFrontTextString26
 	call OpenTextbox
 	ret
 	
-SilentLabP1TextString26: ; 5A97
+SilentHillLabFrontTextString26: ; 5A97
 	text "わたしは"
 	line "はかせの　じょしゅ　です"
 	
@@ -1047,22 +1047,22 @@ SilentLabP1TextString26: ; 5A97
 	cont "なるような　きがします"
 	done
 	
-SilentLabP1Text16: ; 5AEA
-	ld hl, SilentLabP1TextString27
+SilentHillLabFrontText16: ; 5AEA
+	ld hl, SilentHillLabFrontTextString27
 	call OpenTextbox
 	ret
 	
-SilentLabP1TextString27: ; 5AF1
+SilentHillLabFrontTextString27: ; 5AF1
 	text "なんだろう？"
 	line "でんし　てちょう　かな？"
 	done
 	
-SilentLabP1Text17: ; 5B05
-	ld hl, SilentLabP1TextString28
+SilentHillLabFrontText17: ; 5B05
+	ld hl, SilentHillLabFrontTextString28
 	call OpenTextbox
 	ret
 	
-SilentLabP1TextString28: ; 5B0D
+SilentHillLabFrontTextString28: ; 5B0D
 	text "<RIVAL>『あのメールを　くれた"
 	line "オーキドって　こんな　じじい<⋯⋯>"
 	
@@ -1071,18 +1071,18 @@ SilentLabP1TextString28: ; 5B0D
 	cont "ほんもの　はじめて　みたよ！"
 	done
 	
-SilentLabP1TextString29: ; 5B4F
+SilentHillLabFrontTextString29: ; 5B4F
 	text "<RIVAL>『<PLAYER>！"
 	line "なんだか"
 	cont "おもしろく　なってきたな！"
 	done
 	
-SilentLabP1Text18: ; 5B68
-	ld hl, SilentLabP1TextString30
+SilentHillLabFrontText18: ; 5B68
+	ld hl, SilentHillLabFrontTextString30
 	call OpenTextbox
 	ret
 	
-SilentLabP1TextString30: ; 5B6F
+SilentHillLabFrontTextString30: ; 5B6F
 	text "わたしは"
 	line "はかせの　じょしゅ　です"
 	
@@ -1091,12 +1091,12 @@ SilentLabP1TextString30: ; 5B6F
 	cont "なるような　きがします"
 	done
 	
-SilentLabP1Text19: ; 5BA7
-	ld hl, SilentLabP1TextString31
+SilentHillLabFrontText19: ; 5BA7
+	ld hl, SilentHillLabFrontTextString31
 	call OpenTextbox
 	ret
 	
-SilentLabP1TextString31: ; 5BAE
+SilentHillLabFrontTextString31: ; 5BAE
 	text "わたしは"
 	line "はかせの　じょしゅ　です"
 	
diff --git a/maps/SilentHillPokecenter.asm b/maps/SilentHillPokecenter.asm
new file mode 100644
index 0000000..50ab6d3
--- /dev/null
+++ b/maps/SilentHillPokecenter.asm
@@ -0,0 +1,113 @@
+include "constants.asm"
+
+SECTION "Silent Hills Pokecenter", ROMX[$4682], BANK[$34]
+
+SilentHillPokecenterScriptLoader:: ; 4682
+	ld hl, SilentHillPokecenterScriptPointers
+	call RunMapScript
+	call WriteBackMapScriptNumber
+	ret
+	
+SilentHillPokecenterScriptPointers: ; 468C
+	dw SilentHillPokecenterScript 
+	dw SilentHillPokecenterNPCIDs 
+
+SilentHillPokecenterScript: ; 4690
+	ld hl, SilentHillPokecenterNPCIDs
+	ld de, SilentHillPokecenterPCPointer
+	call CallMapTextSubroutine
+	ret
+	
+; 469A
+	dw SilentHillPokecenterNPCIDs
+	
+SilentHillPokecenterNPCIDs: ; 469C
+	db 0
+	db 1
+	db 2
+	db 3
+	db 4
+	db $FF
+	
+SilentHillPokecenterPCPointer: ; 46A2
+	dw SilentHillPokecenterPCText
+	
+SilentHillPokecenterPCText: ; 46A4
+	ld hl, SilentHillPokecenterTextString1
+	call OpenTextbox
+	ret
+	
+SilentHillPokecenterTextString1: ; 46AB
+	text "げんざい　ちょうせいちゅうです"
+	done
+	
+SilentHillPokecenterTextPointers:: ; 46BC
+	dw SilentHillPokecenterNPCText1 
+	dw SilentHillPokecenterNPCText2 
+	dw SilentHillPokecenterNPCText3 
+	dw SilentHillPokecenterNPCText4 
+	dw SilentHillPokecenterNPCText5 
+	
+SilentHillPokecenterNPCText1: ; 46C6
+	ld hl, SilentHillPokecenterTextString2
+	call OpenTextbox
+	ret
+	
+SilentHillPokecenterTextString2: ; 46CD
+	text "もうしわけありませんが"
+	line "ただいま　しゅうりちゅう　でして"
+	
+	para "かいふくは　できません"
+	
+	para "まちから　でるときは"
+	line "じゅうぶんに　おきをつけ　ください"
+	done
+	
+SilentHillPokecenterNPCText2: ; 4714
+	ld hl, SilentHillPokecenterTextString3
+	call OpenTextbox
+	ret
+	
+SilentHillPokecenterTextString3: ; 471B
+	text "あそこに　ある　パソコンは"
+	line "トレーナー　だったら"
+	cont "いつでも　むりょうで"
+	cont "つかうことが　できるよ"
+	cont "きが　きいてるよな！"
+	done 
+	
+SilentHillPokecenterNPCText3: ; 4757
+	ld hl, SilentHillPokecenterTextString4
+	call OpenTextbox
+	ret
+
+SilentHillPokecenterTextString4: ; 475E
+	text "いま　じゅんびちゅうの"
+	line "きかいは　すごいらしいよ"
+	
+	para "なんでも　ときを　こえて"
+	line "ポケモンが　こうかん　できるって！"
+	
+	para "ほんとかな？"
+	done
+	
+SilentHillPokecenterNPCText4: ; 479E
+	ld hl, SilentHillPokecenterTextString5
+	call OpenTextbox
+	ret
+	
+SilentHillPokecenterTextString5: ; 47A5
+	text "こいつ　へルガー"
+	line "いままでにない　タイプの　ポケモンさ"
+	done
+	
+SilentHillPokecenterNPCText5: ; 47C2
+	ld hl, SilentHillPokecenterTextString6
+	call OpenTextbox
+	ret
+	
+SilentHillPokecenterTextString6: ; 47C9
+	text "へルガー『ぐるるうー"
+	done
+	
+; 47D5
+\ No newline at end of file
diff --git a/maps/SilentPokecenter.asm b/maps/SilentPokecenter.asm
deleted file mode 100644
index 30c27c1..0000000
--- a/maps/SilentPokecenter.asm
+++ /dev/null
@@ -1,113 +0,0 @@
-include "constants.asm"
-
-SECTION "maps/SilentPokecenter.asm", ROMX
-
-SilentPokecenterScriptLoader:: ; 4682
-	ld hl, SilentPokecenterScriptPointers
-	call RunMapScript
-	call WriteBackMapScriptNumber
-	ret
-	
-SilentPokecenterScriptPointers: ; 468C
-	dw SilentPokecenterScript 
-	dw SilentPokecenterNPCIDs 
-
-SilentPokecenterScript: ; 4690
-	ld hl, SilentPokecenterNPCIDs
-	ld de, SilentPokecenterPCPointer
-	call CallMapTextSubroutine
-	ret
-	
-; 469A
-	dw SilentPokecenterNPCIDs
-	
-SilentPokecenterNPCIDs: ; 469C
-	db 0
-	db 1
-	db 2
-	db 3
-	db 4
-	db $FF
-	
-SilentPokecenterPCPointer: ; 46A2
-	dw SilentPokecenterPCText
-	
-SilentPokecenterPCText: ; 46A4
-	ld hl, SilentPokecenterTextString1
-	call OpenTextbox
-	ret
-	
-SilentPokecenterTextString1: ; 46AB
-	text "げんざい　ちょうせいちゅうです"
-	done
-	
-SilentPokecenterTextPointers:: ; 46BC
-	dw SilentPokecenterNPCText1 
-	dw SilentPokecenterNPCText2 
-	dw SilentPokecenterNPCText3 
-	dw SilentPokecenterNPCText4 
-	dw SilentPokecenterNPCText5 
-	
-SilentPokecenterNPCText1: ; 46C6
-	ld hl, SilentPokecenterTextString2
-	call OpenTextbox
-	ret
-	
-SilentPokecenterTextString2: ; 46CD
-	text "もうしわけありませんが"
-	line "ただいま　しゅうりちゅう　でして"
-	
-	para "かいふくは　できません"
-	
-	para "まちから　でるときは"
-	line "じゅうぶんに　おきをつけ　ください"
-	done
-	
-SilentPokecenterNPCText2: ; 4714
-	ld hl, SilentPokecenterTextString3
-	call OpenTextbox
-	ret
-	
-SilentPokecenterTextString3: ; 471B
-	text "あそこに　ある　パソコンは"
-	line "トレーナー　だったら"
-	cont "いつでも　むりょうで"
-	cont "つかうことが　できるよ"
-	cont "きが　きいてるよな！"
-	done 
-	
-SilentPokecenterNPCText3: ; 4757
-	ld hl, SilentPokecenterTextString4
-	call OpenTextbox
-	ret
-
-SilentPokecenterTextString4: ; 475E
-	text "いま　じゅんびちゅうの"
-	line "きかいは　すごいらしいよ"
-	
-	para "なんでも　ときを　こえて"
-	line "ポケモンが　こうかん　できるって！"
-	
-	para "ほんとかな？"
-	done
-	
-SilentPokecenterNPCText4: ; 479E
-	ld hl, SilentPokecenterTextString5
-	call OpenTextbox
-	ret
-	
-SilentPokecenterTextString5: ; 47A5
-	text "こいつ　へルガー"
-	line "いままでにない　タイプの　ポケモンさ"
-	done
-	
-SilentPokecenterNPCText5: ; 47C2
-	ld hl, SilentPokecenterTextString6
-	call OpenTextbox
-	ret
-	
-SilentPokecenterTextString6: ; 47C9
-	text "へルガー『ぐるるうー"
-	done
-	
-; 47D5
-\ No newline at end of file
diff --git a/maps/UnusedMap13.asm b/maps/UnusedMap13.asm
new file mode 100644
index 0000000..647188b
--- /dev/null
+++ b/maps/UnusedMap13.asm
@@ -0,0 +1,28 @@
+include "constants.asm"
+
+SECTION "Map 13 Script", ROMX[$6078], BANK[$34]
+
+UnusedMap13ScriptLoader:: ; 6078
+	ld hl, UnusedMap13ScriptPointers
+	call RunMapScript
+	call WriteBackMapScriptNumber
+	ret
+	
+UnusedMap13ScriptPointers: ; 6082
+	dw UnusedMap13Script
+	dw UnusedMap13NPCIDs
+	
+UnusedMap13NPCIDs: ; 6086
+	db $FF 
+	
+UnusedMap13SignPointers: ; 6087
+	dw MapDefaultText
+
+UnusedMap13TextPointers:: ; 6089
+	dw MapDefaultText
+	
+UnusedMap13Script: ; 608B
+	ld hl, UnusedMap13NPCIDs
+	ld de, UnusedMap13SignPointers
+	call CallMapTextSubroutine
+	ret
+\ No newline at end of file
diff --git a/maps/blk/SilentHillLab2.blk b/maps/blk/SilentHillLabBack.blk
index 671e694..671e694 100644
--- a/maps/blk/SilentHillLab2.blk
+++ b/maps/blk/SilentHillLabBack.blk
diff --git a/maps/blk/SilentHillLab.blk b/maps/blk/SilentHillLabFront.blk
index b9daa9d..b9daa9d 100644
--- a/maps/blk/SilentHillLab.blk
+++ b/maps/blk/SilentHillLabFront.blk
diff --git a/maps/blk/SilentPokecenter.blk b/maps/blk/SilentHillPokecenter.blk
index 5003589..5003589 100644
--- a/maps/blk/SilentPokecenter.blk
+++ b/maps/blk/SilentHillPokecenter.blk
author	luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>	2018-07-08 17:34:41 -0400
committer	luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>	2018-07-08 17:34:41 -0400
commit	ca09233c9eca4c6b9b0ccfba436dcd7e3b3e669c (patch)
tree	4f7596be6169491f801756fdda59d6b51a751afe /maps
parent	116b3b251931b0cd973d5d3f312fa32c2b16b197 (diff)