Aventurine City, Bank Split, Initial KEP Fuchsia Port

Had to split bank 2 because I ran out of unreferenced code to comment out when adding Aventurine

Fuchsia was pissing me off so I applied the changes from KEP when adding the safari zone graphics, though it's not currently super close to what it was like in LGPE

Aventurine is very early stages but it's in there :V

data/events/engine_flags.asm

@@ -120,6 +120,7 @@ EngineFlags:
 	engine_flag wVisitedSpawns, SPAWN_SAVOY_CITY
 	engine_flag wVisitedSpawns, SPAWN_CORAL_CITY
 	engine_flag wVisitedSpawns, SPAWN_RUDDY_TOWN
+	engine_flag wVisitedSpawns, SPAWN_AVENTURINE_CITY
 	engine_flag wVisitedSpawns, NUM_SPAWNS ; unused
 
 	engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F

data/maps/attributes.asm

@@ -908,6 +908,8 @@ ENDM
 
 	map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
 	
+	map_attributes AventurineCity, AVENTURINE_CITY, $05, 0 ; this is on its own for now. add connections later.
+	
 	map_attributes WhiteCity, WHITE_CITY, $01, 0 ; this is on its own for now. add connections later.
 	map_attributes Route66WhiteCityGate, ROUTE_66_WHITE_CITY_GATE, $00, 0
 	

data/maps/blocks.asm

@@ -1325,3 +1325,6 @@ Route52_Blocks:
 	
 RuddyTown_Blocks:
 	INCBIN "maps/RuddyTown.ablk"
+	
+AventurineCity_Blocks:
+	INCBIN "maps/AventurineCity.ablk"

data/maps/flypoints.asm

@@ -42,4 +42,5 @@ Flypoints:
 	db LANDMARK_SAVOY_CITY,		  SPAWN_SAVOY_CITY
 	db LANDMARK_CORAL_CITY,		  SPAWN_CORAL_CITY
 	db LANDMARK_RUDDY_TOWN,		  SPAWN_RUDDY_TOWN
+	db LANDMARK_AVENTURINE_CITY,		  SPAWN_AVENTURINE_CITY
 	db -1 ; end

data/maps/landmarks.asm

@@ -147,6 +147,7 @@ Landmarks:
 	landmark  12, 84, Route53Name
 	landmark  12, 68, RuddyTownName
 	landmark 140, 60, BlueForestName
+	landmark 140, 84, AventurineCityName
 	landmark 108, 108, Route66Name
 	landmark 124, 108, WhiteCityName
 	assert_table_length NUM_LANDMARKS
@@ -279,4 +280,5 @@ SavoyCityName:		 db "SAVOY¯CITY@"
 CoralCityName:		 db "CORAL¯CITY@"
 RuddyTownName:		 db "RUDDY¯TOWN@"
 BlueForestName:      db "BLUE¯FOREST@"
+AventurineCityName:  db "AVENTURINE¯CITY@"
 WhiteCityName:       db "WHITE¯CITY@"

data/maps/maps.asm

@@ -57,7 +57,8 @@ MapGroupPointers::
 	dw MapGroup_CoralCity	; 38
 	dw MapGroup_RuddyTown   ; 39
 	dw MapGroup_BlueForest  ; 40
-	dw MapGroup_WhiteCity   ; 41
+	dw MapGroup_Aventurine	; 41
+	dw MapGroup_WhiteCity   ; 42
 	assert_table_length NUM_MAP_GROUPS
 
 MapGroup_Olivine:
@@ -754,6 +755,11 @@ MapGroup_BlueForest:
 	map BlueForest, TILESET_NIHON_SNOWY, TOWN, LANDMARK_BLUE_FOREST, MUSIC_SINJOH_RUINS, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	assert_table_length NUM_BLUE_FOREST_MAPS
 
+MapGroup_Aventurine:
+	table_width MAP_LENGTH, MapGroup_Aventurine
+	map AventurineCity, TILESET_NIHON_01, TOWN, LANDMARK_AVENTURINE_CITY, MUSIC_MART, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	assert_table_length NUM_AVENTURINE_CITY_MAPS
+
 MapGroup_WhiteCity:
 	table_width MAP_LENGTH, MapGroup_WhiteCity
 	map WhiteCity, TILESET_NIHON_WHITECITY, TOWN, LANDMARK_WHITE_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

data/maps/outdoor_sprites.asm

@@ -44,6 +44,7 @@ OutdoorSprites:
 	dw CoralCityGroupSprites
 	dw RuddyTownGroupSprites
 	dw BlueForestGroupSprites
+	dw AventurineCityGroupSprites
 	dw WhiteCityGroupSprites
 	assert_table_length NUM_MAP_GROUPS
 
@@ -332,9 +333,10 @@ IndigoGroupSprites:
 	db SPRITE_POKE_BALL
 	db SPRITE_BOULDER
 
-BlueForestGroupSprites: ; Will have its own thing eventually
-WhiteCityGroupSprites:  ; Ditto
-RuddyTownGroupSprites:  ; Ditto
+BlueForestGroupSprites: 	; Will have its own thing eventually
+AventurineCityGroupSprites:	; Ditto
+WhiteCityGroupSprites:  	; Ditto
+RuddyTownGroupSprites:  	; Ditto
 NewBarkGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY

data/maps/roofs.asm

@@ -52,7 +52,8 @@ MapGroupRoofs:
 	db ROOF_NEW_BARK  ; 38 (Coral City)
 	db ROOF_NEW_BARK  ; 38 (Ruddy Town)
 	db ROOF_NEW_BARK  ; 40 (Blue Forest)
-	db ROOF_NEW_BARK  ; 41 (White City)
+	db ROOF_NEW_BARK  ; 41 (Aventurine City)
+	db ROOF_NEW_BARK  ; 42 (White City)
 	assert_table_length NUM_MAP_GROUPS + 1
 
 Roofs:

data/maps/scripts.asm

@@ -638,4 +638,5 @@ INCLUDE "maps/Route50SavoyCityGate.asm"
 INCLUDE "maps/CoralCity.asm"
 INCLUDE "maps/Route51.asm"
 INCLUDE "maps/Route52.asm"
-INCLUDE "maps/RuddyTown.asm"
+INCLUDE "maps/RuddyTown.asm"
+INCLUDE "maps/AventurineCity.asm"

data/maps/sgb_roof_pal_inds.asm

@@ -44,6 +44,7 @@ MapGroupRoofSGBPalInds:
 	db PREDEFPAL_CORAL_CITY
 	db PREDEFPAL_RUDDY_TOWN
 	db PREDEFPAL_BLUE_FOREST
+	db PREDEFPAL_AVENTURINE
 	db PREDEFPAL_WHITE_CITY
 	assert_table_length NUM_MAP_GROUPS + 1
 
@@ -91,5 +92,6 @@ MapGroupRoofSGBPalIndsMorn:
 	db PREDEFPAL_CORAL_CITY_MORN
 	db PREDEFPAL_RUDDY_TOWN_MORN
 	db PREDEFPAL_BLUE_FOREST_MORN
+	db PREDEFPAL_AVENTURINE_MORN
 	db PREDEFPAL_WHITE_CITY_MORN
 	assert_table_length NUM_MAP_GROUPS + 1

data/maps/spawn_points.asm

@@ -52,6 +52,7 @@ SpawnPoints:
 	spawn SAVOY_CITY,				  25, 15
 	spawn CORAL_CITY,				  31, 11
 	spawn RUDDY_TOWN,				  31, 15
+	spawn AVENTURINE_CITY,			  33, 21
 	
 	spawn N_A,                        -1, -1
 

data/tilesets/kanto_collision.asm

@@ -182,3 +182,8 @@
 	tilecoll WATER, WATER, WATER, WATER ; b5
 	tilecoll WATER, WATER, WATER, WATER ; b6
 	tilecoll WATER, WATER, WATER, WATER ; b7
+	tilecoll WALL, WALL, DOOR, WALL ; b8
+	tilecoll WALL, WALL, WALL, WALL ; b9
+	tilecoll WALL, WALL, WALL, WATER ; ba
+	tilecoll WALL, WALL, WATER, WALL ; bb
+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; bc

data/tilesets/nihon01_collision.asm

@@ -142,3 +142,23 @@
 	tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 8d
 	tilecoll WALL, WALL, WALL, WALL ; 8e
 	tilecoll WALL, WALL, WALL, WALL ; 8f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 90
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 91
+	tilecoll WALL, WALL, DOOR, WALL ; 92
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 93
+	tilecoll WALL, WALL, WALL, WALL ; 94
+	tilecoll WALL, WALL, DOOR, WALL ; 95
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 96
+	tilecoll WALL, WALL, DOOR, DOOR ; 97
+	tilecoll WALL, WALL, WALL, WALL ; 98
+	tilecoll WALL, WALL, WALL, WALL ; 99
+	tilecoll WALL, WALL, WALL, WALL ; 9a
+	tilecoll WALL, WALL, WALL, WALL ; 9b
+	tilecoll WALL, WALL, WALL, DOOR ; 9c
+	tilecoll WALL, WALL, WALL, WALL ; 9d
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 9e
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 9f
+	tilecoll WALL, WALL, WALL, WALL ; a0
+	tilecoll WALL, WALL, WALL, WALL ; a1
+	tilecoll WALL, WALL, WALL, WALL ; a2
+	tilecoll WALL, WALL, DOOR, WALL ; a3