rev

constants/map_constants.asm

@@ -706,7 +706,6 @@ ENDM
 	newgroup SUNGLOW_CITY                                        ; 40
 	map_const ROUTE_57,                                   10, 27 ; 1
 	map_const SUNGLOW_CITY,                                10, 9 ; 2
-	map_const SUNGLOW_WELL,                                10, 9 ; 2
 	endgroup
 	
 	newgroup BLUE_FOREST                                          ; 41

data/maps/attributes.asm

@@ -930,8 +930,6 @@ ENDM
 
 	map_attributes SunglowCity, SUNGLOW_CITY, $03, SOUTH ; this is missing a route connection
 	connection south, Route57, ROUTE_57, 0
-	
-	map_attributes SunglowWell, SUNGLOW_WELL, $03, SOUTH ; this is missing a route connection
 
 	map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
 	

data/maps/blocks.asm

@@ -1345,9 +1345,6 @@ Route57_Blocks:
 SunglowCity_Blocks:
 	INCBIN "maps/SunglowCity.ablk"
 	
-SunglowWell_Blocks:
-	INCBIN "maps/SunglowWell.ablk"
-	
 AventurineCity_Blocks:
 	INCBIN "maps/AventurineCity.ablk"
 

data/maps/maps.asm

@@ -777,7 +777,6 @@ MapGroup_SunglowCity:
 	table_width MAP_LENGTH, MapGroup_SunglowCity
 	map Route57, TILESET_NIHON_BIRDON, ROUTE, LANDMARK_ROUTE_57, MUSIC_MOBILE_ADAPTER_MENU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	map SunglowCity, TILESET_NIHON_BIRDON, TOWN, LANDMARK_SUNGLOW_CITY, MUSIC_MOBILE_ADAPTER_MENU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
-	map SunglowWell, TILESET_UNDERWATER, ROUTE, LANDMARK_SUNGLOW_CITY, MUSIC_MOBILE_ADAPTER, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	assert_table_length NUM_SUNGLOW_CITY_MAPS
 
 MapGroup_BlueForest:

data/tilesets/nihon_birdon_collision.asm

@@ -39,7 +39,7 @@
 	tilecoll WALL, WALL, WALL, WALL ; 25
 	tilecoll WALL, DOOR, FLOOR, FLOOR ; 26
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 27
-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 28
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 28
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 29
 	tilecoll WALL, WALL, WALL, WALL ; 2a
 	tilecoll WALL, WALL, WALL, WALL ; 2b

engine/tilesets/tileset_anims.asm

@@ -78,7 +78,7 @@ TilesetForestAnim:
 
 TilesetJohtoAnim:
 	dw vTiles2 tile $14, AnimateWaterTile
-	dw vTiles2 tile $5b, AnimateDeepWaterTile
+	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
 	dw NULL,  AnimateWaterPalette
 	dw NULL,  WaitTileAnimation
@@ -237,6 +237,7 @@ TilesetTowerAnim:
 	dw NULL,  DoneTileAnimation
 
 TilesetNihon1Anim:
+TilesetNihonBirdonAnim:
 TilesetNihonFontAnim:
 TilesetNihonHighTechAnim:
 TilesetNihonOldAnim:
@@ -254,19 +255,6 @@ TilesetNihonWhiteCityAnim:
 	dw NULL,  WaitTileAnimation
 	dw NULL,  StandingTileFrame8
 	dw NULL,  DoneTileAnimation
-
-TilesetNihonBirdonAnim:
-	dw vTiles2 tile $14, AnimateWaterTile
-	dw NULL,  WaitTileAnimation
-	dw vTiles2 tile $60, AnimateDeepWaterTile
-	dw NULL,  WaitTileAnimation
-	dw NULL,  AnimateWaterPalette
-	dw NULL,  WaitTileAnimation
-	dw NULL,  AnimateFlowerTile
-	dw NULL,  WaitTileAnimation
-	dw NULL,  WaitTileAnimation
-	dw NULL,  StandingTileFrame8
-	dw NULL,  DoneTileAnimation
 	
 TilesetForestKantoAnim:
 	dw NULL,  WaitTileAnimation

engine/tilesets/tileset_palettes.asm

@@ -73,11 +73,6 @@ LoadSpecialMapPalette:
 	scf
 	ret
 	
-.underwater
-	call LoadUnderwaterPalette
-	scf
-	ret
-
 .do_nothing
 	and a
 	ret