diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-31 21:47:52 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-31 21:47:52 -0400 |
| commit | 7607ab4ff452ea7387e7faf931a9a35ff515c5b0 (patch) | |
| tree | 599a7e3ab4438106fa524b15ea1f715d899c485d | |
| parent | 6ddc1b23e39fbebfe7548df8aa269affa08e6255 (diff) | |
Celadon Manion Eevee room
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 7 | ||||
| -rwxr-xr-x | scripts/celadonmansion5.asm | 3 |
4 files changed, 10 insertions, 4 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index e727e344..4262635f 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -132,7 +132,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(CeladonMansion2_h) db BANK(CeladonMansion3_h) db BANK(CeladonMansion4_h) - db $07 ; db BANK(CeladonMansion5_h) + db BANK(CeladonMansion5_h) db $12 ; db BANK(CeladonPokecenter_h) db $12 ; db BANK(CeladonGym_h) db $12 ; db BANK(CeladonGameCorner_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 66feb76f..9d3c5135 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -132,7 +132,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw CeladonMansion2_h dw CeladonMansion3_h ;id=130 dw CeladonMansion4_h - dw $5636 ; dw CeladonMansion5_h + dw CeladonMansion5_h dw $48af ; dw CeladonPokecenter_h dw $4915 ; dw CeladonGym_h dw $4bc8 ; dw CeladonGameCorner_h @@ -302,6 +302,7 @@ CeruleanHouse1Blocks: VermilionHouse1Blocks: INCBIN "maps/viridianhouse.blk" SchoolBlocks: +CeladonMansion5Blocks: INCBIN "maps/school.blk" CeruleanHouseTrashedBlocks: INCBIN "maps/ceruleanhousetrashed.blk" @@ -370,7 +371,11 @@ INCLUDE "scripts/vermiliondock.asm" INCLUDE "data/mapObjects/vermiliondock.asm" VermilionDockBlocks: INCBIN "maps/vermiliondock.blk" - dr $1d636,$1d7ae ; map scripts + +INCLUDE "data/mapHeaders/celadonmansion5.asm" +INCLUDE "scripts/celadonmansion5.asm" +INCLUDE "data/mapObjects/celadonmansion5.asm" + dr $1d685,$1d7ae ; map scripts INCLUDE "data/mapHeaders/diglettscaveroute2.asm" INCLUDE "scripts/diglettscaveroute2.asm" diff --git a/scripts/celadonmansion5.asm b/scripts/celadonmansion5.asm index 6d979e04..346eb6bb 100755 --- a/scripts/celadonmansion5.asm +++ b/scripts/celadonmansion5.asm @@ -1,5 +1,6 @@ CeladonMansion5Script: ; 1dd3a (7:5d3a) - jp EnableAutoTextBoxDrawing + call EnableAutoTextBoxDrawing + ret CeladonMansion5TextPointers: ; 1dd3d (7:5d3d) dw CeladonMansion5Text1 |