diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-28 09:28:59 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-28 09:28:59 -0400 |
| commit | dcd1ecc18f40a8bd2c8e8bcc903153070518fd70 (patch) | |
| tree | 022fa3be277c317f9f508da2036110742225e4ab /main.asm | |
| parent | Blue's House (diff) | |
| download | pokeyellow-dcd1ecc18f40a8bd2c8e8bcc903153070518fd70.tar.gz pokeyellow-dcd1ecc18f40a8bd2c8e8bcc903153070518fd70.tar.xz pokeyellow-dcd1ecc18f40a8bd2c8e8bcc903153070518fd70.zip | |
Oak's Lab Rewrite part 1
Diffstat (limited to 'main.asm')
| -rwxr-xr-x | main.asm | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -289,15 +289,22 @@ INCLUDE "data/mapHeaders/route1.asm" INCLUDE "data/mapObjects/route1.asm" Route1Blocks: ; 1c0fc INCBIN "maps/route1.blk" - dr $1c1b0,$1c21e ; headers, objects, blocks + dr $1c1b0,$1c1c0 ; headers, objects, blocks +OaksLabBlocks: +INCBIN "maps/oakslab.blk" + dr $1c1de,$1c21e ; headers, objects, blocks INCLUDE "engine/clear_save.asm" INCLUDE "engine/predefs7.asm" INCLUDE "scripts/cinnabarisland.asm" - ; dr $1c2c2,$1c358 ; map scripts INCLUDE "scripts/route1.asm" - dr $1c386,$1e2ae ; map scripts + +INCLUDE "data/mapHeaders/oakslab.asm" +INCLUDE "scripts/oakslab.asm" +INCLUDE "data/mapObjects/oakslab.asm" + + dr $1cc6e,$1e2ae ; map scripts INCLUDE "engine/menu/oaks_pc.asm" |