diff --git a/data/maps/spawn_points.asm b/data/maps/spawn_points.asm index 380b0a4..caef55a 100644 --- a/data/maps/spawn_points.asm +++ b/data/maps/spawn_points.asm @@ -39,12 +39,12 @@ SpawnPoints: spawn SILVER_CAVE_OUTSIDE, 23, 20 spawn FAST_SHIP_CABINS_SW_SSW_NW, 6, 2 - spawn ONE_ISLAND, 17, 7 - spawn TWO_ISLAND, 17, 7 ; these are placeholders and hopefully zeta will make them all good and proper them before testing - spawn THREE_ISLAND, 17, 7 - spawn FOUR_ISLAND, 17, 7 - spawn FIVE_ISLAND, 17, 7 - spawn SIX_ISLAND, 17, 7 + spawn ONE_ISLAND, 17, 7 + spawn TWO_ISLAND, 19, 6 ; these are placeholders and hopefully zeta will make them all good and proper them before testing + spawn THREE_ISLAND, 11, 26 + spawn FOUR_ISLAND, 17, 7 + spawn FIVE_ISLAND, 17, 7 + spawn SIX_ISLAND, 17, 7 spawn SEVEN_ISLAND, 17, 7 spawn SILENT_HILLS, 13, 5 diff --git a/data/tilesets/nihon_whitecity_attributes.bin b/data/tilesets/nihon_whitecity_attributes.bin index c48a242..e17af03 100644 Binary files a/data/tilesets/nihon_whitecity_attributes.bin and b/data/tilesets/nihon_whitecity_attributes.bin differ diff --git a/data/tilesets/nihon_whitecity_collision.asm b/data/tilesets/nihon_whitecity_collision.asm index 0e7a175..a75e091 100644 --- a/data/tilesets/nihon_whitecity_collision.asm +++ b/data/tilesets/nihon_whitecity_collision.asm @@ -35,7 +35,7 @@ tilecoll WALL, WALL, WALL, WALL ; 22 tilecoll WALL, WALL, DOOR, DOOR ; 23 tilecoll WALL, WALL, WALL, WALL ; 24 - tilecoll WALL, WALL, WALL, WALL ; 25 + tilecoll WALL, WALL, WALL, DOOR ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 tilecoll WALL, WALL, DOOR, WALL ; 27 tilecoll WALL, WALL, WALL, WALL ; 28 @@ -101,12 +101,20 @@ tilecoll WATER, WATER, WALL, WALL ; 64 tilecoll WALL, FLOOR, WALL, FLOOR ; 65 tilecoll WALL, WALL, WALL, WALL ; 66 - tilecoll WALL, WALL, WALL, WALL ; 67 + tilecoll WALL, WALL, DOOR, WALL ; 67 tilecoll WALL, WATER, WALL, WATER ; 68 tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 69 - tilecoll WALL, WALL, WALL, WALL ; 6a - tilecoll WALL, WALL, WALL, WALL ; 6b - tilecoll WALL, WALL, WALL, WALL ; 6c - tilecoll WALL, WALL, WALL, WALL ; 6d - tilecoll WALL, WALL, WALL, WALL ; 6e - tilecoll WALL, WALL, WALL, WALL ; 6f + tilecoll WALL, WALL, DOOR, WALL ; 6a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 70 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 73 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 74 + tilecoll WALL, WALL, WALL, WALL ; 75 + tilecoll WALL, WALL, WALL, WALL ; 76 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 77 diff --git a/data/tilesets/nihon_whitecity_metatiles.bin b/data/tilesets/nihon_whitecity_metatiles.bin index af00589..5827941 100644 Binary files a/data/tilesets/nihon_whitecity_metatiles.bin and b/data/tilesets/nihon_whitecity_metatiles.bin differ diff --git a/gfx/tilesets/nihon_whitecity.png b/gfx/tilesets/nihon_whitecity.png index 30a9d01..e80190b 100644 Binary files a/gfx/tilesets/nihon_whitecity.png and b/gfx/tilesets/nihon_whitecity.png differ diff --git a/maps/WhiteCity.ablk b/maps/WhiteCity.ablk index 3496b6c..5aa4d93 100644 --- a/maps/WhiteCity.ablk +++ b/maps/WhiteCity.ablk @@ -18,17 +18,17 @@ POXZZSQbCa   LL =>? - +ooo  :7; - 89  + pnq89 tsr /3 -  < +  ooo<    !!!" -  $%#%& < +  $%#j& <    ,-. +012   456   - )'& + )gf   <  `________cccd^^^^^`____