diff --git a/layout.link b/layout.link index 8a16940a..19ebf091 100644 --- a/layout.link +++ b/layout.link @@ -110,14 +110,14 @@ ROMX $14 ROMX $15 "Maps 11" "Battle Engine 9" -ROMX $16 "Maps 12" +ROMX $16 "Maps 13" "Battle Engine 10" "Maps 14" "Saffron Guards" -ROMX $17 "Diploma" +ROMX $17 "Maps 15" "Starter Dex" "Maps 16" diff --git a/maps.asm b/maps.asm index c72f565b..27077bf1 100644 --- a/maps.asm +++ b/maps.asm @@ -700,7 +700,6 @@ Daycare_Blocks: INCBIN "maps/Daycare.blk" ;FuchsiaGoodRodHouse_Blocks: INCBIN "maps/FuchsiaGoodRodHouse.blk" - SECTION "Maps 12", ROMX INCLUDE "scripts/Route2.asm" @@ -727,10 +726,6 @@ INCLUDE "data/maps/headers/Daycare.asm" INCLUDE "scripts/Daycare.asm" INCLUDE "data/maps/objects/Daycare.asm" -INCLUDE "data/maps/headers/Route12SuperRodHouse.asm" -INCLUDE "scripts/Route12SuperRodHouse.asm" -INCLUDE "data/maps/objects/Route12SuperRodHouse.asm" - INCLUDE "data/maps/headers/SilphCo8F.asm" INCLUDE "scripts/SilphCo8F.asm" INCLUDE "data/maps/objects/SilphCo8F.asm" @@ -739,6 +734,10 @@ SilphCo8F_Blocks: INCBIN "maps/SilphCo8F.blk" SECTION "Maps 13", ROMX +INCLUDE "data/maps/headers/Route12SuperRodHouse.asm" +INCLUDE "scripts/Route12SuperRodHouse.asm" +INCLUDE "data/maps/objects/Route12SuperRodHouse.asm" + INCLUDE "data/maps/headers/Route6.asm" INCLUDE "data/maps/objects/Route6.asm" Route6_Blocks: INCBIN "maps/Route6.blk"