diff options
| -rwxr-xr-x | data/mapObjects/route11.asm | 4 | ||||
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 10 |
4 files changed, 11 insertions, 7 deletions
diff --git a/data/mapObjects/route11.asm b/data/mapObjects/route11.asm index 4e196b20..d0c9af20 100755 --- a/data/mapObjects/route11.asm +++ b/data/mapObjects/route11.asm @@ -3,9 +3,9 @@ Route11Object: ; 0x584e0 (size=127) db $5 ; warps db $8, $31, $0, ROUTE_11_GATE_1F - db $9, $31, $1, ROUTE_11_GATE_1F + db $9, $31, $0, ROUTE_11_GATE_1F db $8, $3a, $2, ROUTE_11_GATE_1F - db $9, $3a, $3, ROUTE_11_GATE_1F + db $9, $3a, $2, ROUTE_11_GATE_1F db $5, $4, $0, DIGLETTS_CAVE_ENTRANCE db $1 ; signs diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 429cc87d..63802c23 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -22,7 +22,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $16 ; db BANK(Route8_h) ; ROUTE_8 db $15 ; db BANK(Route9_h) ; ROUTE_9 db $16 ; db BANK(Route10_h) ; ROUTE_10 - db $16 ; db BANK(Route11_h) ; ROUTE_11 + db BANK(Route11_h) ; ROUTE_11 db BANK(Route12_h) ; ROUTE_12 db BANK(Route13_h) ; ROUTE_13 db BANK(Route14_h) ; ROUTE_14 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 9334f585..ad526ba8 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -22,7 +22,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $412d ; dw Route8_h dw $468e ; dw Route9_h dw $42d4 ; dw Route10_h - dw $44be ; dw Route11_h + dw Route11_h dw Route12_h dw Route13_h dw Route14_h @@ -912,8 +912,11 @@ INCBIN "maps/route6.blk" Route8Blocks: ; 581c6 INCBIN "maps/route8.blk" - dr $582d4,$5855f -Route11Blocks: ; 5854f + dr $582d4,$584be + +INCLUDE "data/mapHeaders/route11.asm" +INCLUDE "data/mapObjects/route11.asm" +Route11Blocks: ; 5855f INCBIN "maps/route11.blk" INCLUDE "data/mapHeaders/route12.asm" @@ -944,7 +947,8 @@ INCLUDE "engine/status_ailments.asm" INCLUDE "engine/overworld/oaks_aide.asm" INCLUDE "scripts/route6.asm" - dr $59052,$5948f + dr $59052,$592e8 +INCLUDE "scripts/route11.asm" INCLUDE "scripts/route12.asm" INCLUDE "scripts/route15.asm" INCLUDE "scripts/route16.asm" |