diff options
| -rw-r--r-- | data/map_header_banks.asm | 8 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 8 | ||||
| -rwxr-xr-x | main.asm | 25 |
3 files changed, 31 insertions, 10 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 7f48a4cc..81b1b0a0 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -167,10 +167,10 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(FuchsiaHouse3_h) db BANK(Mansion1_h) db BANK(CinnabarGym_h) - db $1d ; db BANK(Lab1_h) - db $1d ; db BANK(Lab2_h) - db $1d ; db BANK(Lab3_h) - db $1d ; db BANK(Lab4_h) + db BANK(Lab1_h) + db BANK(Lab2_h) + db BANK(Lab3_h) + db BANK(Lab4_h) db $1d ; db BANK(CinnabarPokecenter_h) db $1d ; db BANK(CinnabarMart_h) db $1d ; db BANK(CinnabarMart_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 038a1f0f..ec11970c 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -167,10 +167,10 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw FuchsiaHouse3_h dw Mansion1_h dw CinnabarGym_h - dw $53fb ; dw Lab1_h - dw $5490 ; dw Lab2_h - dw $54f6 ; dw Lab3_h - dw $55a0 ; dw Lab4_h ;id=170 + dw Lab1_h + dw Lab2_h + dw Lab3_h + dw Lab4_h ;id=170 dw $569b ; dw CinnabarPokecenter_h dw $5701 ; dw CinnabarMart_h dw $5701 ; dw CinnabarMart_h ; unused @@ -1492,7 +1492,8 @@ INCLUDE "data/mapHeaders/pokemontower7.asm" INCLUDE "scripts/pokemontower7.asm" INCLUDE "data/mapObjects/pokemontower7.asm" PokemonTower7Blocks: INCBIN "maps/pokemontower7.blk" - dr $60ff2,$610ed + +INCLUDE "engine/overworld/cinnabar_lab.asm" INCLUDE "data/mapHeaders/viridianforest.asm" INCLUDE "scripts/viridianforest.asm" @@ -1671,7 +1672,27 @@ CinnabarGymScript_753f3: bit 7, [hl] pop hl ret - dr $753fb,$757a0 + +INCLUDE "data/mapHeaders/lab1.asm" +INCLUDE "scripts/lab1.asm" +INCLUDE "data/mapObjects/lab1.asm" +Lab1Blocks: INCBIN "maps/lab1.blk" + +INCLUDE "data/mapHeaders/lab2.asm" +INCLUDE "scripts/lab2.asm" +INCLUDE "data/mapObjects/lab2.asm" +Lab2Blocks: INCBIN "maps/lab2.blk" + +INCLUDE "data/mapHeaders/lab3.asm" +INCLUDE "scripts/lab3.asm" +INCLUDE "data/mapObjects/lab3.asm" +Lab3Blocks: INCBIN "maps/lab3.blk" + +INCLUDE "data/mapHeaders/lab4.asm" +INCLUDE "scripts/lab4.asm" +INCLUDE "data/mapObjects/lab4.asm" +Lab4Blocks: INCBIN "maps/lab4.blk" + dr $7569b,$757a0 INCLUDE "data/mapHeaders/gary.asm" INCLUDE "scripts/gary.asm" |