diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-26 10:48:36 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-26 10:48:36 -0400 |
| commit | d9d9354e11afbde77ae510920c498d4143f37013 (patch) | |
| tree | 670076c9cdfb5dd925bf29d5b55a9097989c11d4 | |
| parent | 7229ccb81b8a53683d0158477fc3b8916416c35f (diff) | |
Include Saffron City
| -rwxr-xr-x | data/mapObjects/saffroncity.asm | 5 | ||||
| -rwxr-xr-x | main.asm | 27 |
2 files changed, 24 insertions, 8 deletions
diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/saffroncity.asm index 69e76ee7..5980659b 100755 --- a/data/mapObjects/saffroncity.asm +++ b/data/mapObjects/saffroncity.asm @@ -1,4 +1,4 @@ -SaffronCityObject: ; 0x509dc (size=188) +SaffronCityObject: ; 0x509e2 (size=188) db $f ; border block db $8 ; warps @@ -23,7 +23,7 @@ SaffronCityObject: ; 0x509dc (size=188) db $1d, $1b, $18 ; SaffronCityText24 db $13, $1, $19 ; SaffronCityText25 - db $f ; objects + db $e ; objects object SPRITE_ROCKET, $7, $6, STAY, NONE, $1 ; person object SPRITE_ROCKET, $14, $8, WALK, $2, $2 ; person object SPRITE_ROCKET, $22, $4, STAY, NONE, $3 ; person @@ -38,7 +38,6 @@ SaffronCityObject: ; 0x509dc (size=188) object SPRITE_BIRD, $1f, $c, STAY, DOWN, $c ; person object SPRITE_ROCKER, $12, $8, STAY, UP, $d ; person object SPRITE_ROCKET, $12, $16, STAY, DOWN, $e ; person - object SPRITE_ROCKET, $13, $16, STAY, DOWN, $f ; person ; warp-to EVENT_DISP SAFFRON_CITY_WIDTH, $5, $7 ; COPYCATS_HOUSE_1F @@ -768,10 +768,18 @@ INCBIN "maps/colosseum.blk" SECTION "bank14",ROMX,BANK[$14] - dr $50000,$50a98 -SaffronCityBlocks: + dr $50000,$509aa + +INCLUDE "data/mapHeaders/saffroncity.asm" +INCLUDE "data/mapObjects/saffroncity.asm" +SaffronCityBlocks: ; 50a98 (14:4a98) INCBIN "maps/saffroncity.blk" - dr $50c00,$52060 +INCLUDE "scripts/saffroncity.asm" + + dr $50ca9,$517cc + +; victoryroad2 + dr $517cc,$52060 Mansion2Script_Switches: dr $52060,$522a3 Mansion3Script_Switches: @@ -786,7 +794,10 @@ INCLUDE "engine/hidden_object_functions14.asm" SECTION "bank15",ROMX,BANK[$15] - dr $54000,$5525f + dr $54000,$545da +Route5Blocks: ; 545da +INCBIN "maps/route5.blk" + dr $5468e,$5525f INCLUDE "engine/battle/experience.asm" @@ -799,7 +810,13 @@ INCLUDE "engine/overworld/trainers.asm" SECTION "bank16",ROMX,BANK[$16] - dr $58000,$58b84 + dr $58000,$58079 +Route6Blocks: ; 58079 +INCBIN "maps/route6.blk" + dr $5812d,$581c6 +Route8Blocks: ; 581c6 +INCBIN "maps/route8.blk" + dr $582d4,$58b84 Route16Blocks: ; 58b84 INCBIN "maps/route16.blk" dr $58c38,$58d99 |