From 65d66e10ba727139bf7048bff241e99d140410b6 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Wed, 1 Jun 2016 08:28:26 -0400 Subject: Celadon Mart 5F --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 8 +++++++- scripts/celadonmart5.asm | 3 ++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 87388feb..8e5dea1e 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -136,7 +136,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(CeladonPokecenter_h) db BANK(CeladonGym_h) db BANK(CeladonGameCorner_h) - db $12 ; db BANK(CeladonMart5_h) + db BANK(CeladonMart5_h) db $12 ; db BANK(CeladonPrizeRoom_h) db $12 ; db BANK(CeladonDiner_h) db $12 ; db BANK(CeladonHouse_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 75f8b555..2f51f36e 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -136,7 +136,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw CeladonPokecenter_h dw CeladonGym_h dw CeladonGameCorner_h - dw $507f ; dw CeladonMart5_h + dw CeladonMart5_h dw $5107 ; dw CeladonPrizeRoom_h dw $5168 ; dw CeladonDiner_h dw $51e8 ; dw CeladonHouse_h diff --git a/main.asm b/main.asm index cdf6edaa..12e689c1 100755 --- a/main.asm +++ b/main.asm @@ -949,7 +949,13 @@ INCLUDE "scripts/celadongamecorner.asm" INCLUDE "data/mapObjects/celadongamecorner.asm" CeladonGameCornerBlocks: INCBIN "maps/celadongamecorner.blk" - dr $4907f,$492a9 + +INCLUDE "data/mapHeaders/celadonmart5.asm" +INCLUDE "scripts/celadonmart5.asm" +INCLUDE "data/mapObjects/celadonmart5.asm" +CeladonMart5Blocks: +INCBIN "maps/celadonmart5.blk" + dr $49107,$492a9 INCLUDE "data/mapHeaders/mtmoonpokecenter.asm" INCLUDE "scripts/mtmoonpokecenter.asm" diff --git a/scripts/celadonmart5.asm b/scripts/celadonmart5.asm index 9bd7f991..bf63a7cc 100755 --- a/scripts/celadonmart5.asm +++ b/scripts/celadonmart5.asm @@ -1,5 +1,6 @@ CeladonMart5Script: ; 49069 (12:5069) - jp EnableAutoTextBoxDrawing + call EnableAutoTextBoxDrawing + ret CeladonMart5TextPointers: ; 4906c (12:506c) dw CeladonMart5Text1 -- cgit v1.3.1-sl0p