aboutsummaryrefslogtreecommitdiffstats
path: root/maps.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-11-04 20:11:52 -0500
committerGitHub <noreply@github.com>2020-11-04 20:11:52 -0500
commited03fc4f4a3287a01647e528abba27aac1937de0 (patch)
tree32fef70a31af3a0b5ad2b0d34042c312574fb42d /maps.asm
parentMerge branch 'master' of https://github.com/pret/pokered (diff)
parentStart reorganizing pokeyellow (diff)
downloadpokeyellow-ed03fc4f4a3287a01647e528abba27aac1937de0.tar.gz
pokeyellow-ed03fc4f4a3287a01647e528abba27aac1937de0.tar.xz
pokeyellow-ed03fc4f4a3287a01647e528abba27aac1937de0.zip
Merge pull request #59 from Rangi42/master
Start reorganizing pokeyellow
Diffstat (limited to 'maps.asm')
-rw-r--r--maps.asm35
1 files changed, 35 insertions, 0 deletions
diff --git a/maps.asm b/maps.asm
index 2a7e3392..8a282e63 100644
--- a/maps.asm
+++ b/maps.asm
@@ -1224,3 +1224,38 @@ INCLUDE "data/maps/headers/AgathasRoom.asm"
INCLUDE "scripts/AgathasRoom.asm"
INCLUDE "data/maps/objects/AgathasRoom.asm"
AgathasRoom_Blocks: INCBIN "maps/AgathasRoom.blk"
+
+
+SECTION "Maps 22", ROMX
+
+INCLUDE "scripts/ViridianCity2.asm"
+INCLUDE "scripts/VermilionCity2.asm"
+INCLUDE "scripts/CeladonCity2.asm"
+INCLUDE "scripts/Route1_2.asm"
+INCLUDE "scripts/Route22_2.asm"
+INCLUDE "scripts/RedsHouse1F2.asm"
+INCLUDE "scripts/OaksLab2.asm"
+INCLUDE "scripts/ViridianSchoolHouse2.asm"
+INCLUDE "scripts/Museum1F2.asm"
+INCLUDE "scripts/PewterPokecenter2.asm"
+INCLUDE "scripts/PokemonTower2F_2.asm"
+INCLUDE "scripts/CeladonMart3F_2.asm"
+INCLUDE "scripts/CeladonMansion1F_2.asm"
+INCLUDE "scripts/CeladonMansion3F_2.asm"
+INCLUDE "scripts/GameCorner2.asm"
+INCLUDE "scripts/CeladonDiner2.asm"
+INCLUDE "scripts/SafariZoneGate2.asm"
+INCLUDE "scripts/CinnabarGym3.asm"
+INCLUDE "scripts/MtMoonPokecenter2.asm"
+
+INCLUDE "data/maps/headers/SummerBeachHouse.asm"
+INCLUDE "scripts/SummerBeachHouse.asm"
+SummerBeachHouse_Blocks:
+INCBIN "maps/SummerBeachHouse.blk"
+INCLUDE "data/maps/objects/SummerBeachHouse.asm"
+INCLUDE "scripts/SummerBeachHouse2.asm"
+
+INCLUDE "scripts/BillsHouse2.asm"
+INCLUDE "scripts/ViridianForest2.asm"
+INCLUDE "scripts/SSAnne2FRooms_2.asm"
+INCLUDE "scripts/SilphCo11F_2.asm"