Remaining maps in bank 14

4 files changed, 41 insertions, 38 deletions

diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 14c096dd..3f4e1298 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -212,11 +212,11 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(SilphCo4_h)
 	db BANK(SilphCo5_h)
 	db BANK(SilphCo6_h)
-	db $14 ; db BANK(SilphCo7_h)
+	db BANK(SilphCo7_h)
 	db $15 ; db BANK(SilphCo8_h)
-	db $14 ; db BANK(Mansion2_h)
-	db $14 ; db BANK(Mansion3_h)
-	db $14 ; db BANK(Mansion4_h)
+	db BANK(Mansion2_h)
+	db BANK(Mansion3_h)
+	db BANK(Mansion4_h)
 	db $11 ; db BANK(SafariZoneEast_h)
 	db $11 ; db BANK(SafariZoneNorth_h)
 	db $12 ; db BANK(SafariZoneWest_h)
@@ -229,7 +229,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db $11 ; db BANK(UnknownDungeon2_h)
 	db $11 ; db BANK(UnknownDungeon3_h)
 	db $1d ; db BANK(UnknownDungeon1_h)
-	db $07 ; db BANK(NameRater_h)
+	db BANK(NameRater_h)
 	db $1d ; db BANK(CeruleanHouse2_h)
 	db $01 ; unused
 	db $11 ; db BANK(RockTunnel2_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 672f8c75..fde48bbc 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -212,11 +212,11 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw SilphCo4_h
 	dw SilphCo5_h ;210
 	dw SilphCo6_h
-	dw $5b97 ; dw SilphCo7_h
+	dw SilphCo7_h
 	dw $652a ; dw SilphCo8_h
-	dw $5ff5 ; dw Mansion2_h
-	dw $620b ; dw Mansion3_h
-	dw $63d6 ; dw Mansion4_h
+	dw Mansion2_h
+	dw Mansion3_h
+	dw Mansion4_h
 	dw $5ab3 ; dw SafariZoneEast_h
 	dw $5bf3 ; dw SafariZoneNorth_h
 	dw $635a ; dw SafariZoneWest_h
@@ -229,7 +229,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw $6053 ; dw UnknownDungeon2_h
 	dw $6141 ; dw UnknownDungeon3_h
 	dw $453d ; dw UnknownDungeon1_h
-	dw $530e ; dw NameRater_h
+	dw NameRater_h
 	dw $4643 ; dw CeruleanHouse2_h
 	dw $5649 ; dw Route16Gate_h ; unused
 	dw $624e ; dw RockTunnel2_h
diff --git a/main.asm b/main.asm
index bf650f4b..d9d4089e 100755
--- a/main.asm
+++ b/main.asm
@@ -323,7 +323,8 @@ LavenderHouse1Blocks:
 LavenderHouse2Blocks:
 SaffronHouse1Blocks:
 SaffronHouse2Blocks:
-Route16HouseBlocks: INCBIN "maps/viridianhouse.blk"
+Route16HouseBlocks:
+NameRaterBlocks: INCBIN "maps/viridianhouse.blk"
 SchoolBlocks:
 CeladonMansion5Blocks: INCBIN "maps/school.blk"
 CeruleanHouseTrashedBlocks: INCBIN "maps/ceruleanhousetrashed.blk"
@@ -382,7 +383,10 @@ INCLUDE "data/mapObjects/lavenderhouse1.asm"
 INCLUDE "data/mapHeaders/lavenderhouse2.asm"
 INCLUDE "scripts/lavenderhouse2.asm"
 INCLUDE "data/mapObjects/lavenderhouse2.asm"
-	dr $1d30e,$1d3f8 ; map scripts
+
+INCLUDE "data/mapHeaders/namerater.asm"
+INCLUDE "scripts/namerater.asm"
+INCLUDE "data/mapObjects/namerater.asm"
 
 INCLUDE "data/mapHeaders/vermilionhouse1.asm"
 INCLUDE "scripts/vermilionhouse1.asm"
@@ -1248,13 +1252,26 @@ INCLUDE "scripts/mtmoon2.asm"
 INCLUDE "data/mapObjects/mtmoon2.asm"
 MtMoon2Blocks: INCBIN "maps/mtmoon2.blk"
 
-	dr $51b97,$52060
-Mansion2Script_Switches:
-	dr $52060,$522a3
-Mansion3Script_Switches:
-	dr $522a3,$52449
-Mansion4Script_Switches:
-	dr $52449,$525d8
+INCLUDE "data/mapHeaders/silphco7.asm"
+INCLUDE "scripts/silphco7.asm"
+INCLUDE "data/mapObjects/silphco7.asm"
+SilphCo7Blocks: INCBIN "maps/silphco7.blk"
+
+INCLUDE "data/mapHeaders/mansion2.asm"
+INCLUDE "scripts/mansion2.asm"
+INCLUDE "data/mapObjects/mansion2.asm"
+Mansion2Blocks: INCBIN "maps/mansion2.blk"
+
+INCLUDE "data/mapHeaders/mansion3.asm"
+INCLUDE "scripts/mansion3.asm"
+INCLUDE "data/mapObjects/mansion3.asm"
+Mansion3Blocks: INCBIN "maps/mansion3.blk"
+
+INCLUDE "data/mapHeaders/mansion4.asm"
+INCLUDE "scripts/mansion4.asm"
+INCLUDE "data/mapObjects/mansion4.asm"
+Mansion4Blocks: INCBIN "maps/mansion4.blk"
+
 INCLUDE "engine/overworld/card_key.asm"
 
 INCLUDE "engine/menu/prize_menu.asm"
diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm
index 0735d437..1634472b 100755
--- a/scripts/silphco7.asm
+++ b/scripts/silphco7.asm
@@ -130,9 +130,7 @@ SilphCo7Script0: ; 51c23 (14:5c23)
 	ld [wJoyIgnore], a
 	ld a, PLAYER_DIR_DOWN
 	ld [wPlayerMovingDirection], a
-	ld a, $ff
-	ld [wNewSoundID], a
-	call PlaySound
+	call StopAllMusic
 	ld c, BANK(Music_MeetRival)
 	ld a, MUSIC_MEET_RIVAL
 	call PlayMusic
@@ -186,21 +184,11 @@ SilphCo7Script3: ; 51c82 (14:5c82)
 	ld a, OPP_SONY2
 	ld [wCurOpponent], a
 	ld a, [W_RIVALSTARTER]
-	cp STARTER2
-	jr nz, .asm_51cb6
-	ld a, $7
-	jr .asm_51cc0
-.asm_51cb6
-	cp STARTER3
-	jr nz, .asm_51cbe
-	ld a, $8
-	jr .asm_51cc0
-.asm_51cbe
-	ld a, $9
-.asm_51cc0
+	add 4
 	ld [wTrainerNo], a
 	ld a, $4
-	jp SilphCo7Text_51c10
+	call SilphCo7Text_51c10
+	ret
 
 SilphCo7Script4: ; 51cc8 (14:5cc8)
 	ld a, [wIsInBattle]
@@ -219,9 +207,7 @@ SilphCo7Script4: ; 51cc8 (14:5cc8)
 	ld a, $f
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
-	ld a, $ff
-	ld [wNewSoundID], a
-	call PlaySound
+	call StopAllMusic
 	callba Music_RivalAlternateStart
 	ld de, MovementData_51d1d
 	ld a, [wcf0d]