Ruddy Town!

we're probably going to need to split bank 2 eventually I am running out of unreferenced code to comment out lol

data/events/engine_flags.asm

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

data/maps/attributes.asm

@@ -904,6 +904,8 @@ ENDM
 	map_attributes Route52, ROUTE_52, $6C, EAST
 	connection east, Route51, ROUTE_51, 18
 	
+	map_attributes RuddyTown, RUDDY_TOWN, $04, 0
+
 	map_attributes BlueForest, BLUE_FOREST, $00, 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.

data/maps/blocks.asm

@@ -1322,3 +1322,6 @@ Route51_Blocks:
 	
 Route52_Blocks:
 	INCBIN "maps/Route52.ablk"
+	
+RuddyTown_Blocks:
+	INCBIN "maps/RuddyTown.ablk"

data/maps/flypoints.asm

@@ -41,4 +41,5 @@ Flypoints:
 	db LANDMARK_OLD_CITY,	 	  SPAWN_OLD_CITY
 	db LANDMARK_SAVOY_CITY,		  SPAWN_SAVOY_CITY
 	db LANDMARK_CORAL_CITY,		  SPAWN_CORAL_CITY
+	db LANDMARK_RUDDY_TOWN,		  SPAWN_RUDDY_TOWN
 	db -1 ; end

data/maps/landmarks.asm

@@ -145,6 +145,7 @@ Landmarks:
 	landmark  36, 92, CoralCityName
 	landmark  24, 92, Route52Name
 	landmark  12, 84, Route53Name
+	landmark  12, 68, RuddyTownName
 	landmark 140, 60, BlueForestName
 	landmark 108, 108, Route66Name
 	landmark 124, 108, WhiteCityName
@@ -276,5 +277,6 @@ OldCityName:		 db "SEPIA¯CITY@"
 PokemonPagodaName:	 db "#MON¯PAGODA@"
 SavoyCityName:		 db "SAVOY¯CITY@"
 CoralCityName:		 db "CORAL¯CITY@"
+RuddyTownName:		 db "RUDDY¯TOWN@"
 BlueForestName:      db "BLUE¯FOREST@"
 WhiteCityName:       db "WHITE¯CITY@"

data/maps/maps.asm

@@ -55,8 +55,9 @@ MapGroupPointers::
 	dw MapGroup_OldCity		; 36
 	dw MapGroup_SavoyCity	; 37
 	dw MapGroup_CoralCity	; 38
-	dw MapGroup_BlueForest  ; 39
-	dw MapGroup_WhiteCity   ; 40
+	dw MapGroup_RuddyTown   ; 39
+	dw MapGroup_BlueForest  ; 40
+	dw MapGroup_WhiteCity   ; 41
 	assert_table_length NUM_MAP_GROUPS
 
 MapGroup_Olivine:
@@ -743,6 +744,11 @@ MapGroup_CoralCity:
 	map Route52, TILESET_NIHON_HIGHTECH, ROUTE, LANDMARK_ROUTE_52, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	assert_table_length NUM_CORAL_CITY_MAPS
 
+MapGroup_RuddyTown:
+	table_width MAP_LENGTH, MapGroup_RuddyTown
+	map RuddyTown, TILESET_NIHON_SOUTH, TOWN, LANDMARK_RUDDY_TOWN, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	assert_table_length NUM_RUDDY_TOWN_MAPS
+
 MapGroup_BlueForest:
 	table_width MAP_LENGTH, MapGroup_BlueForest
 	map BlueForest, TILESET_NIHON_SNOWY, TOWN, LANDMARK_BLUE_FOREST, MUSIC_SINJOH_RUINS, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

data/maps/outdoor_sprites.asm

@@ -42,6 +42,7 @@ OutdoorSprites:
 	dw OldCityGroupSprites
 	dw SavoyCityGroupSprites
 	dw CoralCityGroupSprites
+	dw RuddyTownGroupSprites
 	dw BlueForestGroupSprites
 	dw WhiteCityGroupSprites
 	assert_table_length NUM_MAP_GROUPS
@@ -333,6 +334,7 @@ IndigoGroupSprites:
 
 BlueForestGroupSprites: ; Will have its own thing eventually
 WhiteCityGroupSprites:  ; Ditto
+RuddyTownGroupSprites:  ; Ditto
 NewBarkGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY

data/maps/roofs.asm

@@ -50,8 +50,9 @@ MapGroupRoofs:
 	db ROOF_VIOLET    ; 36 (Old City)
 	db ROOF_NEW_BARK  ; 37 (Savoy City)
 	db ROOF_NEW_BARK  ; 38 (Coral City)
-	db ROOF_NEW_BARK  ; 39 (Blue Forest)
-	db ROOF_NEW_BARK  ; 40 (White City)
+	db ROOF_NEW_BARK  ; 38 (Ruddy Town)
+	db ROOF_NEW_BARK  ; 40 (Blue Forest)
+	db ROOF_NEW_BARK  ; 41 (White City)
 	assert_table_length NUM_MAP_GROUPS + 1
 
 Roofs:

data/maps/scripts.asm

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

data/maps/sgb_roof_pal_inds.asm

@@ -42,6 +42,7 @@ MapGroupRoofSGBPalInds:
 	db PREDEFPAL_OLD_CITY
 	db PREDEFPAL_SAVOY_CITY
 	db PREDEFPAL_CORAL_CITY
+	db PREDEFPAL_RUDDY_TOWN
 	db PREDEFPAL_BLUE_FOREST
 	db PREDEFPAL_WHITE_CITY
 	assert_table_length NUM_MAP_GROUPS + 1
@@ -88,6 +89,7 @@ MapGroupRoofSGBPalIndsMorn:
 	db PREDEFPAL_OLD_CITY_MORN
 	db PREDEFPAL_SAVOY_CITY_MORN
 	db PREDEFPAL_CORAL_CITY_MORN
+	db PREDEFPAL_RUDDY_TOWN_MORN
 	db PREDEFPAL_BLUE_FOREST_MORN
 	db PREDEFPAL_WHITE_CITY_MORN
 	assert_table_length NUM_MAP_GROUPS + 1

data/maps/spawn_points.asm

@@ -51,6 +51,7 @@ SpawnPoints:
 	spawn OLD_CITY,				  	  27, 29
 	spawn SAVOY_CITY,				  25, 15
 	spawn CORAL_CITY,				  31, 11
+	spawn RUDDY_TOWN,				  35, 15
 	
 	spawn N_A,                        -1, -1
 

data/tilesets/nihon_south_collision.asm

@@ -12,8 +12,8 @@
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 0b
 	tilecoll FLOOR, WALL, WALL, WALL ; 0c
 	tilecoll WARP_CARPET_DOWN, WARP_CARPET_DOWN, WALL, WALL ; 0d
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 0e
-	tilecoll WALL, WALL, WALL, WALL ; 0f
+	tilecoll WALL, FLOOR, WALL, WALL ; 0e
+	tilecoll WALL, WALL, WALL, DOOR ; 0f
 	tilecoll WALL, WALL, WALL, WALL ; 10
 	tilecoll WALL, WALL, WALL, WALL ; 11
 	tilecoll WALL, WALL, WALL, WALL ; 12
@@ -58,7 +58,7 @@
 	tilecoll WALL, WALL, FLOOR, WALL ; 39
 	tilecoll WATER, WATER, WATER, WATER ; 3a
 	tilecoll WATER, WATER, WATER, WATER ; 3b
-	tilecoll WALL, FLOOR, WALL, WALL ; 3c
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 3c
 	tilecoll WALL, WALL, WALL, WALL ; 3d
 	tilecoll WALL, WALL, WALL, WALL ; 3e
 	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3f