diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-26 10:17:33 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-26 10:17:33 -0400 |
| commit | 7229ccb81b8a53683d0158477fc3b8916416c35f (patch) | |
| tree | 196d50e79e67cddf6d25413c65ddf78f4548d4a0 | |
| parent | aa2dcaedbc481ed6ee976b61709259ac9309ea8d (diff) | |
Include route 7 and link club headers/data
| -rwxr-xr-x | data/mapObjects/route7.asm | 4 | ||||
| -rwxr-xr-x | main.asm | 32 | ||||
| -rwxr-xr-x | scripts/route7.asm | 9 |
3 files changed, 33 insertions, 12 deletions
diff --git a/data/mapObjects/route7.asm b/data/mapObjects/route7.asm index 485a8694..b84fa190 100755 --- a/data/mapObjects/route7.asm +++ b/data/mapObjects/route7.asm @@ -3,9 +3,9 @@ Route7Object: ; 0x48022 (size=47) db $5 ; warps db $9, $12, $2, ROUTE_7_GATE - db $a, $12, $3, ROUTE_7_GATE + db $a, $12, $2, ROUTE_7_GATE db $9, $b, $0, ROUTE_7_GATE - db $a, $b, $1, ROUTE_7_GATE + db $a, $b, $0, ROUTE_7_GATE db $d, $5, $0, PATH_ENTRANCE_ROUTE_7 db $1 ; signs @@ -687,12 +687,15 @@ LoadSpinnerArrowTiles: ; 45077 (11:5077) INCLUDE "engine/overworld/dungeon_warps.asm" SECTION "bank12",ROMX,BANK[$12] - dr $48000, $48051 -; INCLUDE "data/mapHeaders/route7.asm" -; INCLUDE "data/mapObjects/route7.asm" +INCLUDE "data/mapHeaders/route7.asm" +INCLUDE "data/mapObjects/route7.asm" Route7Blocks: ; 48051 INCBIN "maps/route7.blk" - dr $480ab,$4a540 + dr $480ab,$480eb +INCLUDE "scripts/route7.asm" +; INCLUDE "data/mapHeaders/redshouse1f.asm" +; INCLUDE "data/mapObjects/redshouse1f.asm" + dr $480f6,$4a540 SECTION "bank13",ROMX,BANK[$13] @@ -746,12 +749,29 @@ AgathaPic: INCBIN "pic/trainer/agatha.pic" LancePic: INCBIN "pic/trainer/lance.pic" JessieJamesPic: INCBIN "pic/ytrainer/jessiejames.pic" - dr $4fe79,$4ff1a +; 4fe79 (13:7e79) + +INCLUDE "data/mapHeaders/tradecenter.asm" +INCLUDE "scripts/tradecenter.asm" +INCLUDE "data/mapObjects/tradecenter.asm" +TradeCenterBlocks: +INCBIN "maps/tradecenter.blk" + +; 4fee6 (13:7ee6) + +INCLUDE "data/mapHeaders/colosseum.asm" +INCLUDE "scripts/colosseum.asm" +INCLUDE "data/mapObjects/colosseum.asm" +ColosseumBlocks: +INCBIN "maps/colosseum.blk" SECTION "bank14",ROMX,BANK[$14] - dr $50000,$52060 + dr $50000,$50a98 +SaffronCityBlocks: +INCBIN "maps/saffroncity.blk" + dr $50c00,$52060 Mansion2Script_Switches: dr $52060,$522a3 Mansion3Script_Switches: diff --git a/scripts/route7.asm b/scripts/route7.asm index 484fc539..55183d16 100755 --- a/scripts/route7.asm +++ b/scripts/route7.asm @@ -1,9 +1,10 @@ -Route7Script: ; 48152 (12:4152) - jp EnableAutoTextBoxDrawing +Route7Script: ; 480eb (12:40eb) + call EnableAutoTextBoxDrawing + ret -Route7TextPointers: ; 48155 (12:4155) +Route7TextPointers: ; 480ef (12:40ef) dw Route7Text1 -Route7Text1: ; 48157 (12:4157) +Route7Text1: ; 480f1 (12:40f1) TX_FAR _Route7Text1 db "@" |