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 | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index e65ac85a..501b3730 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -45,7 +45,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(ViridianMart_h) db BANK(School_h) db BANK(ViridianHouse_h) - db $1d ; db BANK(ViridianGym_h) + db BANK(ViridianGym_h) db $07 ; db BANK(DiglettsCaveRoute2_h) db $17 ; db BANK(ViridianForestExit_h) db $07 ; db BANK(Route2House_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index aeb2b362..48702db9 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -45,7 +45,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw ViridianMart_h dw School_h dw ViridianHouse_h - dw $40d4 ; dw ViridianGym_h + dw ViridianGym_h dw $57ae ; dw DiglettsCaveRoute2_h dw $5485 ; dw ViridianForestExit_h dw $57eb ; dw Route2House_h @@ -1096,7 +1096,13 @@ SECTION "bank1D",ROMX,BANK[$1D] INCLUDE "engine/items/itemfinder.asm" INCLUDE "scripts/ceruleancity2.asm" - dr $740d4,$74726 + +INCLUDE "data/mapHeaders/viridiangym.asm" +INCLUDE "scripts/viridiangym.asm" +INCLUDE "data/mapObjects/viridiangym.asm" +ViridianGymBlocks: +INCBIN "maps/viridiangym.blk" + dr $744de,$74726 VendingMachineMenu: ; 74726 (1d:4726) dr $74726,$75dfe PKMNLeaguePC: ; 75dfe (1d:5dfe) |