summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/map_header_banks.asm2
-rw-r--r--data/map_header_pointers.asm2
-rwxr-xr-xmain.asm7
-rw-r--r--maps/celadonhotel.blk2
4 files changed, 9 insertions, 4 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 2574a12f..e36b827c 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -140,7 +140,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
db BANK(CeladonPrizeRoom_h)
db BANK(CeladonDiner_h)
db BANK(CeladonHouse_h)
- db $12 ; db BANK(CeladonHotel_h)
+ db BANK(CeladonHotel_h)
db $17 ; db BANK(LavenderPokecenter_h)
db $18 ; db BANK(PokemonTower1_h)
db $18 ; db BANK(PokemonTower2_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index cbd1e821..7f00f77b 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -140,7 +140,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
dw CeladonPrizeRoom_h
dw CeladonDiner_h
dw CeladonHouse_h
- dw $5243 ; dw CeladonHotel_h ;id=140
+ dw CeladonHotel_h ;id=140
dw $479c ; dw LavenderPokecenter_h
dw $4420 ; dw PokemonTower1_h
dw $44e7 ; dw PokemonTower2_h
diff --git a/main.asm b/main.asm
index 2ec12a88..2e48c103 100755
--- a/main.asm
+++ b/main.asm
@@ -973,7 +973,12 @@ INCLUDE "scripts/celadonhouse.asm"
INCLUDE "data/mapObjects/celadonhouse.asm"
CeladonHouseBlocks:
INCBIN "maps/celadonhouse.blk"
- dr $49243,$492a9
+
+INCLUDE "data/mapHeaders/celadonhotel.asm"
+INCLUDE "scripts/celadonhotel.asm"
+INCLUDE "data/mapObjects/celadonhotel.asm"
+CeladonHotelBlocks:
+INCBIN "maps/celadonhotel.blk"
INCLUDE "data/mapHeaders/mtmoonpokecenter.asm"
INCLUDE "scripts/mtmoonpokecenter.asm"
diff --git a/maps/celadonhotel.blk b/maps/celadonhotel.blk
index 07a8b781..d1399446 100644
--- a/maps/celadonhotel.blk
+++ b/maps/celadonhotel.blk
@@ -1,2 +1,2 @@
- 
+ &
 \ No newline at end of file