many minor Outer Crateria fixes and tweaks

[jedat555]

Tileset:

• fixed up tile 1FD

Rooms:
AREA 0

• OLD TOURIAN BOSS ROOM:
  • fixed minor cutoff on dark background tiles
• TORIZO FLYWAY:
  • minor tile swaps
  • fixed minor cutoff on dark background tiles
• MAP FLYWAY:
  • minor tile swaps
• TERMINATOR ROOM:
  • minor stylistic change to the item pedestal
• LOWER MUSHROOMS:
  • fixed cutoff at the foot of the leftmost mushroom
• GREEN PIRATES SHAFT:
  • added missing grass decorations and some minor tile swaps
• OLD TOURIAN SUPER MISSILE:
  • minor tile swaps around the tube and shaft
  • fixed cutoff background tiles at the bottom of the shaft
  • minor stylistic touch-ups to metal tiles
• FINAL MISSILE BOMBWAY:
  • some corner tiles swapped out to avoid minor cutoff
• STATUE HALLWAY:
  • fixed two wrong v-flip tiles around the right door
  • fixed minor cutoff on dark background tiles

AREA 1

• GREEN BRINSTAR MAIN SHAFT:
  • fixed cutoff with ceiling half tiles in the lower section
  • fixed minor CRE brick cutoff next to the item pedestal
  • fixed row of v-flipped ceiling tiles above the bottommost door
• SPORE SPAWN SUPER ROOM:
  • removed one tile of background placed on layer 1 around the lower half right of the shaft
  • stylistic changes to zeb spawners
  • other minor tile swaps around the shaft
• EARLY SUPER ROOM:
  • stylistic changes to zeb spawner and surrounding area
  • minor tile swaps
• BRINSTAR RESERVE TANK:
  • fixed minor cutoff on dark background tiles
• FIREFLEA ROOM:
  • changed grass platforms that were cutoff on top
• DACHORA ROOM:
  • minor tile swaps around the tube
  • fixed minor cutoff on dark background tiles
• BIG PINK:
  • swapped a couple corner tiles that had minor cutoff
  • fixed minor cutoff on dark background tiles
  • stylistic changes to zeb spawners
  • removed duplicate bomb block placed on layer 2
• GREEN HILL ZONE:
  • made appearance of bug spawners consistent
  • fixed minor cutoff on dark background tiles
• MORPH BALL ROOM:
  • fixed minor tiling error beneath the elevator shaft
• CONSTRUCTION ZONE:
  • fixed two minor tiling errors above and beneath the right door
• BLUE BRINSTAR ENERGY TANK ROOM:
  • minor tiling adjustments around the shinespark funnel
• NOOB BRIDGE:
  • fixed spikes not animating
• GREEN BRINSTAR BEETOM ROOM:
  • minor tile swaps
• ETECOON ENERGY TANK ROOM:
  • fixed tiling errors near crumble blocks
• SPORE SPAWN REFILL ROOM:
  • stylistic changes to zeb spawners
• WATERWAY:
  • fixed minor cutoff on dark background tiles
• XRAY PUZZLE:
  • fixed minor CRE brick cutoff
• CATAPILLER ROOM:
  • minor tile swaps at bottom of elevator shaft
  • fixed cutoff around CRE pipes
• ALPHA POWER BOMB ROOM:
  • minor CRE brick tile swaps
• BELOW SPAZER:
  • fixed minor cutoff on dark background tiles
• WAREHOUSE ZEELA ROOM:
  • swapped out a corner tile
• WAREHOUSE KIHUNTER ROOM:
  • fixed minor cutoff on dark background tiles
• MINI KRAID HALLWAY:
  • very minor grass adjustment
• KRAID BOSS DOOR:
  • minor tile swaps to fix some cutoff
• KRAID HIDEOUT ENTRANCE:
  • minor corrections on the CRE pipes
  • minor tile swaps

AREA 2

• CATHEDRAL ENTRANCE:
  • fixed up a bunch of cutoff and weird spots
  • minor stylistic change to the left door ledge
• CATHEDRAL:
  • fixed up some weird spots
• BUSINESS CENTER:
  • fixed up some cutoff and weird spots
• ICE BEAM GATE ROOM:
  • minor tile swaps and fixes
• CROCOMIRE SPEEDWAY:
  • touched up the grassy platforms on the right
  • stylistic changes to embedded metal tiles
  • minor tile swaps and fixes
• HIGH JUMP ROOM:
  • minor tile swaps
• CROCOMIRE ESCAPE:
  • touched up some of the grassy platforms
  • fixed minor cutoff on dark background tiles
  • minor tile swaps and fixes
• HI JUMP ENERGY TANK ROOM:
  • fixed minor cutoff on dark background tiles
  • minor tile swaps and fixes
• POST CROCOMIRE FARMING ROOM:
  • minor tile swaps and fixes
• POST CROCOMIRE POWER BOMB ROOM:
  • minor tile swaps and fixes
  • minor stylistic touch-ups to metal tiles
• POST CROCOMIRE SHAFT:
  • grass platform tweaks
• POST CROCOMIRE MISSILE ROOM:
  • fixed minor tiling errors and cutoff
  • minor stylistic touch-ups to metal tiles
• GRAPPLE TUTORIAL ROOM 3:
  • minor tile swaps and fixes
• GRAPPLE JUMP CAVERN:
  • grass platform tweaks
  • minor tile swaps and fixes
  • minor stylistic touch-ups to metal tiles
• GRAPPLE TUTORIAL ROOM 2:
  • minor tile swaps
• GRAPPLE TUTORIAL ROOM 1:
  • fixed two h-flipped ceiling tiles on the right
• NORFAIR RESERVE TANK:
  • minor tile swaps
• GREEN BUBBLES MISSILE ROOM:
  • minor tile swaps
• BUBBLE MOUNTAIN:
  • fixed spikes not animating
  • minor tile swaps and fixes
  • minor stylistic change to the top left platform
• SPEEDBOOSTER HALL:
  • minor tile swaps and fixes
• SPEEDBOOSTER ROOM:
  • minor tile swaps
• SINGLE CHAMBER:
  • touched up grass platforms
  • minor tile swaps and fixes
• DOUBLE CHAMBER:
  • touched up grass platforms
  • minor tile swaps and fixes
  • minor stylistic change to platform beneath the gate
• WAVE BEAM ROOM:
  • fixed minor cutoff on CRE brick
  • minor tile swaps
• SPIKY PLATFORMS TUNNEL:
  • minor tile swaps and fixes
• VOLCANO ROOM:
  • minor tile swaps and fixes
  • minor stylistic changes to non-CRE platforms
• KRONIC BOOST ROOM:
  • minor tile swaps and fixes
  • minor grass platform adjustments
• MAGDOLLITE TUNNEL:
  • minor ceiling tile swaps
• PURPLE SHAFT:
  • very minor tile swaps
• LAVA DIVE ROOM:
  • fixed a bunch of minor tiling errors
• UPPER NORFAIR FARMING ROOM:
  • grass platform tweaks
  • minor tile swaps and fixes
  • changed pillars on the bottom left CRE platform to better reflect collision
• RISING TIDE:
  • very minor tile swap on the ceiling
• ACID SNAKES TUNNEL:
  • very minor fixes
  • minor stylistic touch-ups to metal tiles
• SPIKY ACID SNAKES TUNNEL:
  • minor tile swaps
• PURPLE REFILL ROOM:
  • very minor fixes
• BUBBLE MOUNTIAN BAT ROOM:
  • minor fixes and tile swaps
• SPEEDBOOSTER RUBBLE HALLWAY:
  • minor tile swaps and fixes
• RED PIRATE SHAFT:
  • very minor tile swaps
• GOLDEN CHOZO STATUE:
  • minor tile swaps and fixes around the statue and in the bottom right section
• LOWER NORFAIR MAIN HALL:
  • minor tile swaps and fixes
• FAST RIPPER ROOM:
  • minor tile swaps and fixes
  • minor stylistic touch-ups to metal tiles
• RIDLEY BOSS DOOR:
  • minor tile swaps and fixes
  • minor stylistic touch-ups to metal tiles
• FAST PILLARS SETUP ROOM:
  • minor fixes and tile swaps
• MICKEY MOUSE:
  • fixed two tiling errors on rightmost wall
• PILLAR ROOM:
  • minor fixes and tile swaps
• PLOWERHOUSE ROOM:
  • minor tile swaps above and near both doors
• THE WORST ROOM IN THE GAME:
  • minor tile swaps and fixes at the top of the room and beneath the bomb blocks
  • minor stylistic touch-ups to metal tiles
• AMPHITHEATRE:
  • touched up the right door ledge
  • minor fixes and tile swaps
  • minor stylistic touch-ups to metal tiles
• LOWER NORFAIR MAZE ROOM:
  • fixed minor CRE brick cutoff above the item
  • minor tile swaps and fixes
  • minor stylistic touch-ups to metal tiles
• LOWER NORFAIR POWER BOMB:
  • very minor tile swaps around both doors
• RED KEYHUNTER SHAFT:
  • added missing grass decorations
  • tweaked a bunch of weird spots throughout
  • minor stylistic touch-ups to metal tiles
• WASTELAND:
  • minor ceiling tweaks
  • minor stylistic touch-ups to metal tiles
• NINJA PIRATES ROOM:
  • minor ceiling tweaks near both doors
• THREE MUSKATEERS ROOM:
  • fixed wrong CRE pipe tile above the morph tunnel
  • swapped a bunch of ground tiles in the missile area
  • minor ceiling tweaks near the left door
• BROKEN HATCHLING CONTAINER:
  • minor ceiling tweaks and tile swaps around the CRE pipes
• SCREW ATTACK ROOM:
  • minor ceiling tweaks above the chozo and at the very top
• DRAGON ROCK:
  • removed a duplicate door tile placed on layer 2 at the top right door
  • removed a bunch of duplicate layer 1 tiles placed on layer 2
  • minor background and foreground tile adjustments and fixes
  • minor stylistic touch-ups to metal tiles

AREA 3

• BOWLING ALLEY:
  • fixed cutoff half-tiles near the bottom door
  • minor conveyor tweaks
  • minor tile swaps and fixes
  • minor stylistic touch-ups to metal tiles
• WRECKED SHIP ENTRANCE:
  • minor conveyor tweaks
  • adjusted BG X scroll speed to make it a bit less jarring
• ATTIC:
  • very minor tile swaps around the left and right door
• ATTIC MISSILE ROOM:
  • fixed minor cutoff above the door
  • minor tile swaps and fixes
• WRECKED SHIP MAIN SHAFT:
  • very minor tile swap above the top left door
• ELECTRIC DEATH ROOM:
  • fixed a bunch of minor cutoff
  • minor stylistic change to platform beneath 2x2 shot blocks to avoid grass cutoff
  • minor stylistic touch-ups to metal tiles
• WRECKED SHIP ENERGY TANK ROOM:
  • added missing grass decorations
  • very minor tile swaps
• BASEMENT:
  • very minor tile swap around the left door
  • small stylistic change to avoid spark appearing over nothing
• WRECKED SHIP EAST SUPER ROOM:
  • fixed cutoff above the door
  • very minor tile swap beneath the metal structure
• GRAVITY SUIT ROOM:
  • minor tile swaps

AREA 4

• MARIDIA MAIN STREET:
  • fixed missing slope corner tile on the left of the morph tunnel
• FISH TANK:
  • fixed minor tiling error on "sponge" decoration near the bottom right door
• CRAB TUNNEL:
  • fixed missing slope corner tile near the left door
• PUFFER MOUNTIAN:
  • small stylistic changes to some grapple posts on the ceiling to make their appearance consistent
• NORTHWEST MARIDIA BUG ROOM:
  • fixed minor background (layer 2) cutoff
  • very minor adjustments on the grassy platforms
• CRAB SHAFT:
  • minor CRE tiling tweaks
• PSEUDO PLASMA SPARK ROOM:
  • touched up the small "floating island" platform
• PLASMA BEAM ROOM:
  • fixed minor cutoff on dark background tiles
  • minor tile swaps on the wrecked ship pillars on the bottom
• THREAD THE NEEDLE ROOM:
  • very minor tile swaps above both doors
• MARIDIA ELEVATOR ROOM:
  • swapped out some wrong slope tiles next to the CRE pipes
  • very minor tile swap beneath the right door
• PLASMA SPARK ROOM:
  • minor tile swaps around the doors
  • fixed minor cutoff on and around the black background tiles
  • touched up the "floating island" platform
  • minor adjustments around the background transition to avoid a rough tileset transition
  • fixed minor cutoff on a ceiling slope
• PLASMA CLIMB:
  • very minor tile swaps around both doors
• WEST SAND HALL:
  • fixed up the background on the right
• OASIS:
  • very minor CRE brick tile swap
• WEST SAND HOLE CAVE:
  • minor tweaks around the item pedestals and on the sandfall ceiling
• EAST SAND HOLE CAVE:
  • minor tweaks on the sandfall ceiling, around the left item pedestal and on the right wall
• WEST QUICKSAND ROOM:
  • very minor tile swaps
• MARIDIA AQUEDUCT:
  • minor tile swaps on wrecked ship tiles
• BUTTERFLY ROOM:
  • minor ceiling tweaks
• BOTWOON HALLWAY:
  • swapped out one CRE pipe tile near the left door
• PANTS ROOM & EAST PANT ROOM:
  • swapped a corner tile above the right door
• BELOW BOTWOON QUICKSAND ROOM:
  • fixed missing slope corner tile above the leftmost sand pool
  • minor ceiling tweaks above the sandfalls
• COLOSSEUM:
  • minor tile swaps around the left door and on wrecked ship tiles
• DRAYGON BOSS DOOR:
  • minor tile swaps on the wrecked ship pillars on the bottom
• SHAKTOOL ROOM:
  • switched to water tileset for the floor to make it more consistent with other water rooms
  • significantly varied up the diggable blocks
• HALFIE ROOM:
  • minor tile swaps on CRE pipes
• SPACE JUMP ROOM:
  • swapped fill tiles for darker ones beneath the crateria water tiles
  • very minor tile swap on the left wall
• WEST CACTUS ALLEY:
  • very minor CRE pipe tile swap above the right door
• EAST CACTUS ALLEY:
  • minor tile swaps
  • fixed missing corner tile beneath one of the spike pits

AREA 5

• TOURIAN ELEVATOR:
  • very minor tile swaps beneath both doors
• METROID ROOM 1:
  • fixed a v-flipped tile on the ceiling
  • very minor tile swaps around the left door
  • fixed minor cutoff on dark background tiles
• METROID ROOM 2:
  • very minor tile swaps around both doors
• METROID ROOM 3:
  • h-flipped a single ceiling tile
• METROID ROOM 4:
  • very minor tile swap beneath the top door
• BLUE SIDEHOPPERS:
  • minor fixes on ceiling half tiles
• DUST TORIZO ROOM:
  • minor fixes on ceiling half tiles
• BABY METROID ROOM:
  • minor fixes on half tiles
• MOTHER BRAIN BOSS DOOR:
  • half tile fixes and tweaks
  • very minor tile swap beneath the left door
• TOURIAN ESCAPE ROOM 1:
  • very minor tile swaps on the top right
• TOURIAN HORIZONTAL ESCAPE:
  • minor stylistic touch-ups to metal tiles
• TOURIAN VERTICAL ESCAPE:
  • minor stylistic touch-ups to metal tiles
  • very minor tile swaps on the far left and right sides

[blkerby]

I'm guessing the change to the palette for tileset $08 was a mistake? If so, can you revert that? Also the change to project.xml should be reverted.

The changes to 16x16 tiles for tileset $00 would have actual conflicts; to resolve this, it may be simplest to checkout the file from the upstream and then reapply the change you made to the one tile.

[jedat555]

The palette change must've indeed been a mistake, sorry about that. I think all should be in order now, hopefully?

Applying the tileset file from upstream, I did notice the Crateria tube tiles got messed up, but I'm not sure if that's just on my end or if it's even an issue in the first place.

[blkerby]

The palette change must've indeed been a mistake, sorry about that. I think all should be in order now, hopefully?

Applying the tileset file from upstream, I did notice the Crateria tube tiles got messed up, but I'm not sure if that's just on my end or if it's even an issue in the first place.

You may want to merge the upstream into your branch. It's expected that stuff would look messed up by pulling in only the updated 16x16 tiles without the corresponding 8x8 tiles which were also updated (on tileset $00 and on CRE and other tilesets)

[jedat555]

You may want to merge the upstream into your branch. It's expected that stuff would look messed up by pulling in only the updated 16x16 tiles without the corresponding 8x8 tiles which were also updated (on tileset $00 and on CRE and other tilesets)

Ah, I see. I'm guessing it's fine to do that even while this PR is open and it's not going to cause problems?

[blkerby]

You may want to merge the upstream into your branch. It's expected that stuff would look messed up by pulling in only the updated 16x16 tiles without the corresponding 8x8 tiles which were also updated (on tileset $00 and on CRE and other tilesets)

Ah, I see. I'm guessing it's fine to do that even while this PR is open and it's not going to cause problems?

Yeah it should be fine. If you're using the GitHub UI just avoid selecting an option to "discard your commits". Let me know if you need any help with it. Really appreciate your work on this!

[jedat555]

Alright, I think I've got it now. Thanks for the guidance, and no problem! Happy to help.

[blkerby]

Looks like the tests are failing because the collision layer was modified in a few places. This is a common problem so no big deal. The tests are there to validate that no changes are made to the collision (relative to the Base project). If you open the test details, it will list the specific rooms & tiles that have an issue.

[jedat555]

Should be fixed now.