diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-26 18:57:48 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-26 18:57:48 -0400 |
| commit | 8916d80ef45c6411040a311b11174f83ce845313 (patch) | |
| tree | 85b85730fd6e2b2f547c6ed43518097a85dbb94a /main.asm | |
| parent | Final phase 3 of Viridian City script disassembly (diff) | |
| download | pokeyellow-8916d80ef45c6411040a311b11174f83ce845313.tar.gz pokeyellow-8916d80ef45c6411040a311b11174f83ce845313.tar.xz pokeyellow-8916d80ef45c6411040a311b11174f83ce845313.zip | |
Disassemble Route 1
Diffstat (limited to 'main.asm')
| -rwxr-xr-x | main.asm | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -236,10 +236,10 @@ INCLUDE "data/mapHeaders/celadoncity.asm" INCLUDE "data/mapObjects/celadoncity.asm" CeladonCityBlocks: INCBIN "maps/celadoncity.blk" - dr $182a1,$18357 ; headers, objects, blocks + dr $182a1,$182fd ; headers, objects, blocks ; INCLUDE "data/mapHeaders/pallettown.asm" ; INCLUDE "data/mapObjects/pallettown.asm" -; PalletTownBlocks: INCBIN "maps/pallettown.blk" +PalletTownBlocks: INCBIN "maps/pallettown.blk" INCLUDE "data/mapHeaders/viridiancity.asm" INCLUDE "data/mapObjects/viridiancity.asm" @@ -283,8 +283,14 @@ INCLUDE "engine/overworld/doors.asm" INCLUDE "engine/overworld/ledges.asm" SECTION "bank07",ROMX,BANK[$07] +; INCLUDE "data/mapHeaders/cinnabarisland.asm" +; INCLUDE "data/mapObjects/cinnabarisland.asm" + dr $1c000,$1c069 ; headers, objects, blocks +CinnabarIslandBlocks: +INCBIN "maps/cinnabarisland.blk" - dr $1c000,$1c0fc ; headers, objects, blocks +INCLUDE "data/mapHeaders/route1.asm" +INCLUDE "data/mapObjects/route1.asm" Route1Blocks: ; 1c0fc INCBIN "maps/route1.blk" dr $1c1b0,$1c21e ; headers, objects, blocks @@ -292,7 +298,9 @@ INCBIN "maps/route1.blk" INCLUDE "engine/clear_save.asm" INCLUDE "engine/predefs7.asm" - dr $1c2c2,$1e2ae ; map scripts + dr $1c2c2,$1c358 ; map scripts +INCLUDE "scripts/route1.asm" + dr $1c386,$1e2ae ; map scripts INCLUDE "engine/menu/oaks_pc.asm" |