diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 047dcc87..e3a1a10a 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -119,10 +119,10 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db $1d ; unused
 	db $1d ; unused
 	db BANK(HallofFameRoom_h)
-	db $18 ; db BANK(UndergroundPathNS_h)
+	db BANK(UndergroundPathNS_h)
 	db BANK(Gary_h)
-	db $18 ; db BANK(UndergroundPathWE_h)
-	db $11 ; db BANK(CeladonMart1_h)
+	db BANK(UndergroundPathWE_h)
+	db BANK(CeladonMart1_h)
 	db $15 ; db BANK(CeladonMart2_h)
 	db $12 ; db BANK(CeladonMart3_h)
 	db $12 ; db BANK(CeladonMart4_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 9809a532..4f7b8fdd 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -122,7 +122,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw UndergroundPathNS_h
 	dw Gary_h ;id=120
 	dw UndergroundPathWE_h
-	dw $42b7 ; dw CeladonMart1_h
+	dw CeladonMart1_h
 	dw $60d9 ; dw CeladonMart2_h
 	dw $4157 ; dw CeladonMart3_h
 	dw $4251 ; dw CeladonMart4_h
diff --git a/engine/bank3d.asm b/engine/bank3d.asm
index fe90f99b..f86bcf21 100644
--- a/engine/bank3d.asm
+++ b/engine/bank3d.asm
@@ -366,7 +366,7 @@ HandleMenuInputPokemonSelectionDouble:: ; f5a44 (3d:5a44)
 	and A_BUTTON | B_BUTTON
 	jr z, .skipPlayingSound
 .AButtonOrBButtonPressed
-	ld a, $90 ; (SFX_02_40 - SFX_Headers_02) / 3
+	ld a, SFX_PRESS_AB
 	call PlaySound ; play sound
 .skipPlayingSound
 	pop af
@@ -381,7 +381,7 @@ Func_f5ab0:: ; f5ab0 (3d:5ab0)
 	and a
 	jr z, .asm_f5ac0
 	coord hl, 0, 0
-	ld bc, $14
+	ld bc, SCREEN_WIDTH
 .loop
 	add hl, bc
 	dec a
@@ -442,7 +442,7 @@ PrintStrengthTxt:: ; f5b06 (3d:5b06)
 
 Text_f5b17:: ; f5b17 (3d:5b17)
 	TX_FAR _UsedStrengthText ; 2d:417e
-	db $08 ; asm
+	TX_ASM
 	ld a, [wcf91]
 	call PlayCry
 	call Delay3
diff --git a/main.asm b/main.asm
index a9e70775..1de4969d 100755
--- a/main.asm
+++ b/main.asm
@@ -831,7 +831,13 @@ INCLUDE "engine/pokedex_rating.asm"
 INCLUDE "data/mapHeaders/viridianpokecenter.asm"
 INCLUDE "scripts/viridianpokecenter.asm"
 INCLUDE "data/mapObjects/viridianpokecenter.asm"
-	dr $442b7,$443b7
+
+INCLUDE "data/mapHeaders/celadonmart1.asm"
+INCLUDE "scripts/celadonmart1.asm"
+INCLUDE "data/mapObjects/celadonmart1.asm"
+CeladonMart1Blocks:
+INCBIN "maps/celadonmart1.blk"
+	dr $44344,$443b7
 Mansion1Script_Switches:
 	dr $443b7,$44571
 
diff --git a/scripts/celadonmart1.asm b/scripts/celadonmart1.asm
index 041af8b3..4f297a6e 100755
--- a/scripts/celadonmart1.asm
+++ b/scripts/celadonmart1.asm
@@ -1,5 +1,6 @@
 CeladonMart1Script: ; 60f86 (18:4f86)
-	jp EnableAutoTextBoxDrawing
+	call EnableAutoTextBoxDrawing
+	ret
 
 CeladonMart1TextPointers: ; 60f89 (18:4f89)
 	dw CeladonMart1Text1