Remaining maps in bank 1D (and the whole ROM)

7 files changed, 42 insertions, 19 deletions

diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm
index c55711b4..0635e9a7 100755
--- a/data/mapObjects/unknowndungeon1.asm
+++ b/data/mapObjects/unknowndungeon1.asm
@@ -14,10 +14,11 @@ UnknownDungeon1Object: ; 0x74d15 (size=97)
 
 	db $0 ; signs
 
-	db $3 ; objects
-	object SPRITE_BALL, $7, $d, STAY, NONE, $1, FULL_RESTORE
-	object SPRITE_BALL, $13, $3, STAY, NONE, $2, MAX_ELIXER
-	object SPRITE_BALL, $5, $0, STAY, NONE, $3, NUGGET
+	db $4 ; objects
+	object SPRITE_BALL, $1d, $10, STAY, NONE, $1, RARE_CANDY
+	object SPRITE_BALL, $7, $b, STAY, NONE, $2, MAX_ELIXER
+	object SPRITE_BALL, $1d, $9, STAY, NONE, $3, MAX_REVIVE
+	object SPRITE_BALL, $12, $3, STAY, NONE, $4, ULTRA_BALL
 
 	; warp-to
 	EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $11, $18
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 01d33040..eef36242 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -228,9 +228,9 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(SafariZoneRestHouse4_h)
 	db BANK(UnknownDungeon2_h)
 	db BANK(UnknownDungeon3_h)
-	db $1d ; db BANK(UnknownDungeon1_h)
+	db BANK(UnknownDungeon1_h)
 	db BANK(NameRater_h)
-	db $1d ; db BANK(CeruleanHouse2_h)
+	db BANK(CeruleanHouse2_h)
 	db $01 ; unused
 	db BANK(RockTunnel2_h)
 	db BANK(SilphCo9_h)
@@ -245,7 +245,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db $11 ; unused
 	db $11 ; unused
 	db $11 ; unused
-	db $1d ; db BANK(Lorelei_h)
-	db $1d ; db BANK(Bruno_h)
-	db $1d ; db BANK(Agatha_h)
+	db BANK(Lorelei_h)
+	db BANK(Bruno_h)
+	db BANK(Agatha_h)
 	db BANK(BeachHouse_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 259ab1bd..730038f3 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -228,9 +228,9 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw SafariZoneRestHouse4_h
 	dw UnknownDungeon2_h
 	dw UnknownDungeon3_h
-	dw $453d ; dw UnknownDungeon1_h
+	dw UnknownDungeon1_h
 	dw NameRater_h
-	dw $4643 ; dw CeruleanHouse2_h
+	dw CeruleanHouse2_h
 	dw Route16Gate_h ; unused
 	dw RockTunnel2_h
 	dw SilphCo9_h
@@ -245,7 +245,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw SilphCo2_h ; unused
 	dw SilphCo2_h ; unused
 	dw SilphCo2_h ; unused
-	dw $59ef ; dw Lorelei_h
-	dw $5b4a ; dw Bruno_h
-	dw $5ca1 ; dw Agatha_h ;247
+	dw Lorelei_h
+	dw Bruno_h
+	dw Agatha_h ;247
 	dw BeachHouse_h
diff --git a/main.asm b/main.asm
index 40549f9d..18c401aa 100755
--- a/main.asm
+++ b/main.asm
@@ -1876,7 +1876,7 @@ CinnabarMartBlocks: INCBIN "maps/pewtermart.blk"
 FuchsiaHouse1Blocks: INCBIN "maps/fuchsiahouse1.blk"
 FuchsiaPokecenterBlocks:
 CinnabarPokecenterBlocks: INCBIN "maps/fuchsiapokecenter.blk"
-	dr $7404c,$7405c
+CeruleanHouse2Blocks: INCBIN "maps/ceruleanhouse2.blk"
 
 INCLUDE "engine/items/itemfinder.asm"
 INCLUDE "scripts/ceruleancity2.asm"
@@ -1890,7 +1890,14 @@ INCLUDE "data/mapHeaders/pewtermart.asm"
 INCLUDE "scripts/pewtermart.asm"
 INCLUDE "data/mapObjects/pewtermart.asm"
 
-	dr $7453d,$74726
+INCLUDE "data/mapHeaders/unknowndungeon1.asm"
+INCLUDE "scripts/unknowndungeon1.asm"
+INCLUDE "data/mapObjects/unknowndungeon1.asm"
+UnknownDungeon1Blocks: INCBIN "maps/unknowndungeon1.blk"
+
+INCLUDE "data/mapHeaders/ceruleanhouse2.asm"
+INCLUDE "scripts/ceruleanhouse2.asm"
+INCLUDE "data/mapObjects/ceruleanhouse2.asm"
 
 INCLUDE "engine/menu/vending_machine.asm"
 
@@ -1982,7 +1989,21 @@ INCLUDE "data/mapHeaders/gary.asm"
 INCLUDE "scripts/gary.asm"
 INCLUDE "data/mapObjects/gary.asm"
 GaryBlocks: INCBIN "maps/gary.blk"
-	dr $759ef,$75dfe
+
+INCLUDE "data/mapHeaders/lorelei.asm"
+INCLUDE "scripts/lorelei.asm"
+INCLUDE "data/mapObjects/lorelei.asm"
+LoreleiBlocks: INCBIN "maps/lorelei.blk"
+
+INCLUDE "data/mapHeaders/bruno.asm"
+INCLUDE "scripts/bruno.asm"
+INCLUDE "data/mapObjects/bruno.asm"
+BrunoBlocks: INCBIN "maps/bruno.blk"
+
+INCLUDE "data/mapHeaders/agatha.asm"
+INCLUDE "scripts/agatha.asm"
+INCLUDE "data/mapObjects/agatha.asm"
+AgathaBlocks: INCBIN "maps/agatha.blk"
 
 INCLUDE "engine/menu/league_pc.asm"
 
diff --git a/scripts/unknowndungeon1.asm b/scripts/unknowndungeon1.asm
index 696ddafa..9951dc52 100755
--- a/scripts/unknowndungeon1.asm
+++ b/scripts/unknowndungeon1.asm
@@ -5,3 +5,4 @@ UnknownDungeon1TextPointers: ; 74d0f (1d:4d0f)
 	dw PickUpItemText
 	dw PickUpItemText
 	dw PickUpItemText
+	dw PickUpItemText
diff --git a/text/maps/agatha.asm b/text/maps/agatha.asm
index 7d1b97bb..95b455c8 100644
--- a/text/maps/agatha.asm
+++ b/text/maps/agatha.asm
@@ -38,7 +38,7 @@ _AgathaAfterBattleText::
 	cont "along now, child!"
 	done
 
-_AgathaText2::
+_AgathaDontRunAwayText::
 	text "Someone's voice:"
 	line "Don't run away!"
 	done
diff --git a/text/maps/bruno.asm b/text/maps/bruno.asm
index dea3d201..ddcbdb59 100644
--- a/text/maps/bruno.asm
+++ b/text/maps/bruno.asm
@@ -31,7 +31,7 @@ _BrunoAfterBattleText::
 	cont "challenge!"
 	done
 
-_UnnamedText_763d2::
+_BrunoDontRunAwayText::
 	text "Someone's voice:"
 	line "Don't run away!"
 	done