diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-03 21:20:08 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-03 21:20:08 -0400 |
| commit | 27e6f58c35072d279e6794064ce4b854df815797 (patch) | |
| tree | a58de58349023340b0eac4cac06136f40a3eba22 | |
| parent | 35cc755f663be0810576c9348d39b6d5e811e623 (diff) | |
Remaining maps in Bank 12
| -rw-r--r-- | data/map_header_banks.asm | 6 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 6 | ||||
| -rwxr-xr-x | main.asm | 10 |
3 files changed, 15 insertions, 7 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index ab536b39..6de9bbcb 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -219,10 +219,10 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Mansion4_h) db BANK(SafariZoneEast_h) db BANK(SafariZoneNorth_h) - db $12 ; db BANK(SafariZoneWest_h) + db BANK(SafariZoneWest_h) db BANK(SafariZoneCenter_h) db BANK(SafariZoneRestHouse1_h) - db $12 ; db BANK(SafariZoneSecretHouse_h) + db BANK(SafariZoneSecretHouse_h) db BANK(SafariZoneRestHouse2_h) db BANK(SafariZoneRestHouse3_h) db BANK(SafariZoneRestHouse4_h) @@ -236,7 +236,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(SilphCo9_h) db BANK(SilphCo10_h) db $18 ; db BANK(SilphCo11_h) - db $11 ; db BANK(SilphCoElevator_h) + db BANK(SilphCoElevator_h) db $11 ; unused db $11 ; unused db BANK(TradeCenter_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index d476cd56..6a4fc9f2 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -219,10 +219,10 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Mansion4_h dw SafariZoneEast_h dw SafariZoneNorth_h - dw $635a ; dw SafariZoneWest_h + dw SafariZoneWest_h dw SafariZoneCenter_h ;220 dw SafariZoneRestHouse1_h - dw $64bc ; dw SafariZoneSecretHouse_h + dw SafariZoneSecretHouse_h dw SafariZoneRestHouse2_h dw SafariZoneRestHouse3_h dw SafariZoneRestHouse4_h @@ -236,7 +236,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw SilphCo9_h dw SilphCo10_h dw $6105 ; dw SilphCo11_h - dw $5a08 ; dw SilphCoElevator_h + dw SilphCoElevator_h dw SilphCo2_h ; unused dw SilphCo2_h ; unused dw TradeCenter_h @@ -1189,7 +1189,15 @@ MtMoon3Script_4a325: ; pikachu-related function? call Func_159b ret - dr $4a35a,$4a540 +INCLUDE "data/mapHeaders/safarizonewest.asm" +INCLUDE "scripts/safarizonewest.asm" +INCLUDE "data/mapObjects/safarizonewest.asm" +SafariZoneWestBlocks: INCBIN "maps/safarizonewest.blk" + +INCLUDE "data/mapHeaders/safarizonesecrethouse.asm" +INCLUDE "scripts/safarizonesecrethouse.asm" +INCLUDE "data/mapObjects/safarizonesecrethouse.asm" +SafariZoneSecretHouseBlocks: INCBIN "maps/safarizonesecrethouse.blk" SECTION "bank13",ROMX,BANK[$13] |