Merge branch 'master' of https://github.com/ZetaNull/jep-hack

# Conflicts:
#	data/tilesets/nihon_old_attributes.bin
#	data/tilesets/nihon_old_metatiles.bin
#	maps/OldCity.ablk

Just going to redo what I did after this whoops

data/maps/attributes.asm

@@ -829,6 +829,9 @@ ENDM
 	map_attributes OldCityPokecenter1F, OLD_CITY_POKECENTER_1F, $00, 0
 	map_attributes OldMart, OLD_MART, $00, 0
 	map_attributes HoneyGrandmasHouse, HONEY_GRANDMAS_HOUSE, $00, 0
+	map_attributes OldCityEarlsHouse, OLD_CITY_EARLS_HOUSE, $00, 0
+	map_attributes OldCityFamilyHouse, OLD_CITY_FAMILY_HOUSE, $00, 0
+	map_attributes SepiaSchool, SEPIA_SCHOOL, $00, 0
 	
 	map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
 	

data/maps/blocks.asm

@@ -415,6 +415,8 @@ EcruteakLugiaSpeechHouse_Blocks:
 EcruteakItemfinderHouse_Blocks:
 VioletNicknameSpeechHouse_Blocks:
 VioletKylesHouse_Blocks:
+OldCityEarlsHouse_Blocks:
+OldCityFamilyHouse_Blocks:
 	INCBIN "maps/House2.ablk"
 
 UnionCaveB1F_Blocks:
@@ -1230,3 +1232,6 @@ OldCity_Blocks:
 
 HoneyGrandmasHouse_Blocks:
 	INCBIN "maps/HoneyGrandmasHouse.ablk"
+
+SepiaSchool_Blocks:
+	INCBIN "maps/SepiaSchool.ablk"

data/maps/landmarks.asm

@@ -249,5 +249,6 @@ UnknownName:         db "?????@"
 Route66Name:         db "ROUTE 66@"
 Route49Name:         db "ROUTE 49@"
 QuietCaveName:       db "QUIET¯CAVE@"
-OldCityName:		 db "OLD CITY@" ; I've considered the name "Archaic City", whereas "High Tech" will be "Vogue City". Thoughts? Archaic is considered a little snarly in modern day, so I haven't put it in yet.
+OldCityName:		 db "SEPIA¯CITY@"
+; High Tech will be called "Vogue City"
 BlueForestName:      db "BLUE¯FOREST@"

data/maps/maps.asm

@@ -699,6 +699,9 @@ MapGroup_OldCity:
 	map OldCityPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_OLD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map OldMart, TILESET_NIHON_MART, INDOOR, LANDMARK_OLD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map HoneyGrandmasHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map OldCityEarlsHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map OldCityFamilyHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map SepiaSchool, TILESET_LAB, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	assert_table_length NUM_OLD_CITY_MAPS
 
 MapGroup_BlueForest:

data/maps/scripts.asm

@@ -582,6 +582,9 @@ INCLUDE "maps/OldCity.asm"
 INCLUDE "maps/OldCityPokecenter1F.asm"
 INCLUDE "maps/OldMart.asm"
 INCLUDE "maps/HoneyGrandmasHouse.asm"
+INCLUDE "maps/OldCityEarlsHouse.asm"
+INCLUDE "maps/OldCityFamilyHouse.asm"
+INCLUDE "maps/SepiaSchool.asm"
 
 SECTION "Map Scripts 30", ROMX ; spillover
 INCLUDE "maps/TanobyRuins.asm"

data/tilesets/lab_collision.asm

@@ -46,13 +46,13 @@
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
 	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 30
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 31
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 32
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 33
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 34
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 35
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 36
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39

data/tilesets/nihon_old_collision.asm

@@ -62,3 +62,4 @@
 	tilecoll WALL, DOOR, FLOOR, FLOOR ; 3d
 	tilecoll DOOR, WALL, WALL, WALL ; 3e
 	tilecoll WALL, WALL, WALL, WALL ; 3f
+	tilecoll WALL, WALL, FLOOR, WALL ; 40

data/trainers/parties_new_classes.asm

@@ -87,6 +87,7 @@ SoldierGroup:
 	end_list_items
 
 SportsmanGroup:
+	; one should be called Jet, using Dodrio, Electrode, Rapidash, Tauros, and Bellosom. Manga character.
 	next_list_item ; SPORTSMAN (1)
 	db "JACQUES@", TRAINERTYPE_NORMAL
 	db 23