diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-01 18:56:11 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-01 18:56:11 -0400 |
| commit | 68dbc1cace667ebbf1ad1aa38a7aa906b8322821 (patch) | |
| tree | 7d089af66c177ffbc8ede032d0e9a129237af8b3 | |
| parent | 8504fdc45d164992c9059dbf0d390afc5acc0a0c (diff) | |
Fuchsia Mart
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 8 | ||||
| -rwxr-xr-x | scripts/fuchsiamart.asm | 3 |
4 files changed, 10 insertions, 5 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 6a46f4ae..31c629f5 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -152,7 +152,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(LavenderHouse1_h) db BANK(LavenderMart_h) db BANK(LavenderHouse2_h) - db $07 ; db BANK(FuchsiaMart_h) + db BANK(FuchsiaMart_h) db $1d ; db BANK(FuchsiaHouse1_h) db $1d ; db BANK(FuchsiaPokecenter_h) db $1d ; db BANK(FuchsiaHouse2_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 1c1eb08b..eb0bb978 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -152,7 +152,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw LavenderHouse1_h dw LavenderMart_h ;id=150 dw LavenderHouse2_h - dw $5685 ; dw FuchsiaMart_h + dw FuchsiaMart_h dw $4851 ; dw FuchsiaHouse1_h dw $489c ; dw FuchsiaPokecenter_h dw $4902 ; dw FuchsiaHouse2_h @@ -320,7 +320,6 @@ INCLUDE "data/mapObjects/viridianmart.asm" ViridianMartBlocks: CeladonMartBlocks: SaffronMartBlocks: -FuchsiaMartBlocks: CinnabarMartBlocks: INCBIN "maps/viridianmart.blk" INCLUDE "data/mapHeaders/school.asm" @@ -373,7 +372,12 @@ VermilionDockBlocks: INCBIN "maps/vermiliondock.blk" INCLUDE "data/mapHeaders/celadonmansion5.asm" INCLUDE "scripts/celadonmansion5.asm" INCLUDE "data/mapObjects/celadonmansion5.asm" - dr $1d685,$1d7ae ; map scripts + +INCLUDE "data/mapHeaders/fuchsiamart.asm" +INCLUDE "scripts/fuchsiamart.asm" +INCLUDE "data/mapObjects/fuchsiamart.asm" +FuchsiaMartBlocks: INCBIN "maps/fuchsiamart.blk" + dr $1d6db,$1d7ae ; map scripts INCLUDE "data/mapHeaders/diglettscaveroute2.asm" INCLUDE "scripts/diglettscaveroute2.asm" diff --git a/scripts/fuchsiamart.asm b/scripts/fuchsiamart.asm index 792dafa2..41aec49a 100755 --- a/scripts/fuchsiamart.asm +++ b/scripts/fuchsiamart.asm @@ -1,5 +1,6 @@ FuchsiaMartScript: ; 1dd88 (7:5d88) - jp EnableAutoTextBoxDrawing + call EnableAutoTextBoxDrawing + ret FuchsiaMartTextPointers: ; 1dd8b (7:5d8b) dw FuchsiaMartText1 |