diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-31 22:05:54 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-31 22:05:54 -0400 |
| commit | 717ee9ff15c28afb84b1977fe1654ec68c2ef9af (patch) | |
| tree | a5efe5b21f0bb7a86a86fec58ab2bfc32c92410f | |
| parent | 6d80537563abb145d48c1f3cde003e50e482e1dd (diff) | |
Celadon Gym
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 8 | ||||
| -rw-r--r-- | maps/celadongym.blk | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 06432efe..11d2a28b 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -134,7 +134,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(CeladonMansion4_h) db BANK(CeladonMansion5_h) db BANK(CeladonPokecenter_h) - db $12 ; db BANK(CeladonGym_h) + db BANK(CeladonGym_h) db $12 ; db BANK(CeladonGameCorner_h) db $12 ; db BANK(CeladonMart5_h) db $12 ; db BANK(CeladonPrizeRoom_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 0556b7a2..bacc67e3 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -134,7 +134,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw CeladonMansion4_h dw CeladonMansion5_h dw CeladonPokecenter_h - dw $4915 ; dw CeladonGym_h + dw CeladonGym_h dw $4bc8 ; dw CeladonGameCorner_h dw $507f ; dw CeladonMart5_h dw $5107 ; dw CeladonPrizeRoom_h @@ -937,7 +937,13 @@ INCBIN "maps/celadonmansion4.blk" INCLUDE "data/mapHeaders/celadonpokecenter.asm" INCLUDE "scripts/celadonpokecenter.asm" INCLUDE "data/mapObjects/celadonpokecenter.asm" - dr $48915,$492a9 + +INCLUDE "data/mapHeaders/celadongym.asm" +INCLUDE "scripts/celadongym.asm" +INCLUDE "data/mapObjects/celadongym.asm" +CeladonGymBlocks: +INCBIN "maps/celadongym.blk" + dr $48bc8,$492a9 INCLUDE "data/mapHeaders/mtmoonpokecenter.asm" INCLUDE "scripts/mtmoonpokecenter.asm" diff --git a/maps/celadongym.blk b/maps/celadongym.blk index dcecc50c..7ac1b683 100644 --- a/maps/celadongym.blk +++ b/maps/celadongym.blk @@ -1 +1 @@ -38:933<3=33;?>3344356344321
\ No newline at end of file +58:963<3=33;?>3344356344321
\ No newline at end of file |