Mt Moon B1F

4 files changed, 17 insertions, 15 deletions

diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index c840cd82..c51722d6 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -59,7 +59,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(PewterMart_h)
 	db BANK(PewterHouse2_h)
 	db BANK(PewterPokecenter_h)
-	db $12 ; db BANK(MtMoon1_h)
+	db BANK(MtMoon1_h)
 	db $14 ; db BANK(MtMoon2_h)
 	db $12 ; db BANK(MtMoon3_h)
 	db $07 ; db BANK(CeruleanHouseTrashed_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index cc700617..10a0216f 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -59,7 +59,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw PewterMart_h
 	dw PewterHouse2_h
 	dw PewterPokecenter_h
-	dw $5953 ; dw MtMoon1_h
+	dw MtMoon1_h
 	dw $5a78 ; dw MtMoon2_h ;id=60
 	dw $5c7e ; dw MtMoon3_h
 	dw $4ec3 ; dw CeruleanHouseTrashed_h
diff --git a/main.asm b/main.asm
index 33332dff..fadf6417 100755
--- a/main.asm
+++ b/main.asm
@@ -786,7 +786,14 @@ INCLUDE "scripts/redshouse1f.asm"
 INCLUDE "data/mapObjects/redshouse1f.asm"
 RedsHouse1FBlocks:
 INCBIN "maps/redshouse1f.blk"
-	dr $48157,$4a540
+	dr $48157,$49953
+
+INCLUDE "data/mapHeaders/mtmoon1.asm"
+INCLUDE "scripts/mtmoon1.asm"
+INCLUDE "data/mapObjects/mtmoon1.asm"
+MtMoon1Blocks:
+INCBIN "maps/mtmoon1.blk"
+	dr $49c7e,$4a540
 
 
 SECTION "bank13",ROMX,BANK[$13]
diff --git a/scripts/mtmoon1.asm b/scripts/mtmoon1.asm
index 4a5eeae3..a649481c 100755
--- a/scripts/mtmoon1.asm
+++ b/scripts/mtmoon1.asm
@@ -97,42 +97,37 @@ MtMoon1TrainerHeader7: ; 49a45 (12:5a45)
 MtMoon1Text1: ; 49a52 (12:5a52)
 	TX_ASM
 	ld hl, MtMoon1TrainerHeader0
-	call TalkToTrainer
-	jp TextScriptEnd
+	jr MtMoon1TalkToTrainer
 
 MtMoon1Text2: ; 49a5c (12:5a5c)
 	TX_ASM
 	ld hl, MtMoon1TrainerHeader2
-	call TalkToTrainer
-	jp TextScriptEnd
+	jr MtMoon1TalkToTrainer
 
 MtMoon1Text3: ; 49a66 (12:5a66)
 	TX_ASM
 	ld hl, MtMoon1TrainerHeader3
-	call TalkToTrainer
-	jp TextScriptEnd
+	jr MtMoon1TalkToTrainer
 
 MtMoon1Text4: ; 49a70 (12:5a70)
 	TX_ASM
 	ld hl, MtMoon1TrainerHeader4
-	call TalkToTrainer
-	jp TextScriptEnd
+	jr MtMoon1TalkToTrainer
 
 MtMoon1Text5: ; 49a7a (12:5a7a)
 	TX_ASM
 	ld hl, MtMoon1TrainerHeader5
-	call TalkToTrainer
-	jp TextScriptEnd
+	jr MtMoon1TalkToTrainer
 
 MtMoon1Text6: ; 49a84 (12:5a84)
 	TX_ASM
 	ld hl, MtMoon1TrainerHeader6
-	call TalkToTrainer
-	jp TextScriptEnd
+	jr MtMoon1TalkToTrainer
 
 MtMoon1Text7: ; 49a8e (12:5a8e)
 	TX_ASM
 	ld hl, MtMoon1TrainerHeader7
+MtMoon1TalkToTrainer:
 	call TalkToTrainer
 	jp TextScriptEnd