Vermilion Gym

3 files changed, 9 insertions, 3 deletions

diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index f83ba5f7..98849126 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -92,7 +92,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(VermilionPokecenter_h)
 	db BANK(FanClub_h)
 	db BANK(VermilionMart_h)
-	db $17 ; db BANK(VermilionGym_h)
+	db BANK(VermilionGym_h)
 	db $07 ; db BANK(VermilionHouse1_h)
 	db $07 ; db BANK(VermilionDock_h)
 	db $18 ; db BANK(SSAnne1_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 68908f5f..b5cfc4d8 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -92,7 +92,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw VermilionPokecenter_h
 	dw FanClub_h ;id=90
 	dw VermilionMart_h
-	dw $4910 ; dw VermilionGym_h
+	dw VermilionGym_h
 	dw $53f8 ; dw VermilionHouse1_h
 	dw $544e ; dw VermilionDock_h
 	dw $52a4 ; dw SSAnne1_h
diff --git a/main.asm b/main.asm
index ef5381a4..6c10fe37 100755
--- a/main.asm
+++ b/main.asm
@@ -1287,7 +1287,13 @@ INCLUDE "data/mapObjects/vermilionpokecenter.asm"
 INCLUDE "data/mapHeaders/vermilionmart.asm"
 INCLUDE "scripts/vermilionmart.asm"
 INCLUDE "data/mapObjects/vermilionmart.asm"
-	dr $5c910,$5d485
+
+INCLUDE "data/mapHeaders/vermiliongym.asm"
+INCLUDE "scripts/vermiliongym.asm"
+INCLUDE "data/mapObjects/vermiliongym.asm"
+VermilionGymBlocks:
+INCBIN "maps/vermiliongym.blk"
+	dr $5cb5b,$5d485
 
 INCLUDE "data/mapHeaders/viridianforestexit.asm"
 INCLUDE "scripts/viridianforestexit.asm"