diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 12:46:48 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 12:46:48 -0400 |
| commit | 35ab6056cae9e69b557dffac762ef68c55c8d286 (patch) | |
| tree | a62cba078710062c1b23436104fe030716a08744 /main.asm | |
| parent | 2b96f4165f01fb41cb8c302a8da9d9a3131ab92e (diff) | |
Route 6 scripts
Diffstat (limited to 'main.asm')
| -rwxr-xr-x | main.asm | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -873,7 +873,8 @@ INCLUDE "engine/overworld/trainers.asm" SECTION "bank16",ROMX,BANK[$16] - dr $58000,$58079 +INCLUDE "data/mapHeaders/route6.asm" +INCLUDE "data/mapObjects/route6.asm" Route6Blocks: ; 58079 INCBIN "maps/route6.blk" dr $5812d,$581c6 @@ -893,7 +894,8 @@ INCLUDE "engine/status_ailments.asm" INCLUDE "engine/overworld/oaks_aide.asm" - dr $58f47,$5a53a +INCLUDE "scripts/route6.asm" + dr $59052,$5a53a INCLUDE "engine/overworld/saffron_guards.asm" |