diff options
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 10 |
3 files changed, 11 insertions, 3 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index c51722d6..dd088a1b 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -60,7 +60,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(PewterHouse2_h) db BANK(PewterPokecenter_h) db BANK(MtMoon1_h) - db $14 ; db BANK(MtMoon2_h) + db BANK(MtMoon2_h) db $12 ; db BANK(MtMoon3_h) db $07 ; db BANK(CeruleanHouseTrashed_h) db $07 ; db BANK(CeruleanHouse1_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 10a0216f..0e5149e3 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -60,7 +60,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw PewterHouse2_h dw PewterPokecenter_h dw MtMoon1_h - dw $5a78 ; dw MtMoon2_h ;id=60 + dw MtMoon2_h ;id=60 dw $5c7e ; dw MtMoon3_h dw $4ec3 ; dw CeruleanHouseTrashed_h dw $4f34 ; dw CeruleanHouse1_h @@ -909,7 +909,15 @@ INCLUDE "scripts/route24.asm" INCLUDE "scripts/route25.asm" ; victoryroad2 - dr $517cc,$52060 + dr $517cc,$51a78 + +INCLUDE "data/mapHeaders/mtmoon2.asm" +INCLUDE "scripts/mtmoon2.asm" +INCLUDE "data/mapObjects/mtmoon2.asm" +MtMoon2Blocks: +INCBIN "maps/mtmoon2.blk" + + dr $51b97,$52060 Mansion2Script_Switches: dr $52060,$522a3 Mansion3Script_Switches: |