diff --git a/brush/src/components/Map/Point/PointObject.js b/brush/src/components/Map/Point/PointObject.js index e170a02..391e82e 100644 --- a/brush/src/components/Map/Point/PointObject.js +++ b/brush/src/components/Map/Point/PointObject.js @@ -13,6 +13,9 @@ const objectIdToColor = { 0x2C: [0xB3FF62, 1], 0x2D: [0x8CFFFA, 1], 0x2E: [0xBCC9CF, 1], + 0x2F: [0xFF2A00, 1], + 0x31: [0xFF2A00, 1], + 0x32: [0xFF2A00, 1], 0x6F: [0xCD5851, 1], 0x76: [0x438F36, 1], 0x77: [0x21722B, 1], diff --git a/brush/src/constants/tileNameToColor.js b/brush/src/constants/tileNameToColor.js index 25c7d06..ac45e9d 100644 --- a/brush/src/constants/tileNameToColor.js +++ b/brush/src/constants/tileNameToColor.js @@ -1,17 +1,24 @@ const tileNameToColor = { blueDoor: [0x6464D7, 0.5], + blueRock: [0x4F37BD, 1], board: [0xC7C7C7, 0.5], bridge: [0xC8833F, 1], bridgeRope: [0xC8833F, 0.5], + bush: [0x004700, 0.5], + circleWood: [0xD47B68, 1], + column: [0xBA6F3D, 0.5], darkRock: [0x5A3C3F, 1], empty: [0xFFFFFF, 1], grass: [0x007D00, 1], + ladder: [0x46A54B, 0.75], lightRock: [0xC8643F, 1], redDoor: [0xD76464, 0.5], rock: [0xA03C3F, 1], + rope: [0xE8451A, 0.75], spike: [0xC81446, 1], unknown: [0x000000, 1], wood: [0xBC6F5D, 1], + wood2: [0xA66151, 1], } export default tileNameToColor diff --git a/scissors/src/objectMaps.js b/scissors/src/objectMaps.js index 3a26a3e..0dff322 100644 --- a/scissors/src/objectMaps.js +++ b/scissors/src/objectMaps.js @@ -7,6 +7,9 @@ const objectIdToName = { 0x2C: 'Dream Stone', 0x2D: 'Large Dream Stone', 0x2E: 'One Up', + 0x2F: 'Goomi', + 0x31: 'Mobile Goomi ⭥', + 0x32: 'Mobile Goomi ⤡', 0x6F: 'Box', 0x76: 'Moo', 0x77: 'Flying Moo ⭤', diff --git a/scissors/src/visions/1-5.js b/scissors/src/visions/1-5.js new file mode 100644 index 0000000..f732dba --- /dev/null +++ b/scissors/src/visions/1-5.js @@ -0,0 +1,64 @@ +export default { + location: { + worldName: 'Ghazzaland', + world: 1, + index: 5, + }, + rom: { + tilemap: 0x1B8A28, + customTilemap: 0x36A250, + objects: [0xE7050, 0xE7579], + portals: [0xD4B68, 0xD4BAF], + }, + tilemap: { + totalStages: 4, + height: 120, + width: 270, + scheme: [ + { + name: 'rope', + ids: [0x3C, 0x0A], + }, + { + name: 'board', + ids: [0x0E, 0x0D, 0x05, 0x0C, 0x37, 0x11, 0x3A, 0x39, 0x37, 0x09, 0x07, 0x0B, 0x0F, 0x38, 0x04], + }, + { + name: 'blueRock', + ids: [0x66, 0xD9, 0x53, 0x55, 0xD8, 0xBE, 0xAF, 0xAE, 0xB3, 0x89, 0x7E, 0x76, 0xB5, 0x76, 0xA6, 0xA8, 0x4C, 0xA7, 0x5F, 0x5B, 0x74, 0x73, 0xA4, 0xD2, 0xD1, 0x4B, 0x52, 0x44, 0xB9, 0x44, 0xBD, 0xD3, 0x56, 0x69, 0x78, 0x8A, 0x88, 0x68, 0x8B, 0x8C, 0xA5, 0x48, 0xD7, 0xA3, 0x60, 0xD4, 0xB1, 0x54], + }, + { + name: 'spike', + ids: [0x3D], + }, + { + name: 'bush', + ids: [0x03, 0x01, 0x02, 0x14, 0x13, 0x10], + }, + { + name: 'column', + ids: [0x15, 0x12], + }, + { + name: 'wood2', + ids: [0xBA, 0xB4, 0xC0, 0xB6, 0xBB, 0xB7, 0xC2, 0xC1, 0xC3, 0xBF, 0xD0, 0xBC, 0xB8, 0xC4, 0xC5], + }, + { + name: 'circleWood', + ids: [0x5A, 0x5C, 0x43, 0x40, 0x42, 0x5D, 0x59, 0x57, 0x58, 0x4D, 0x5E, 0x41, 0x62, 0x65], + }, + { + name: 'ladder', + ids: [0x08, 0x3B, 0x06], + }, + { + name: 'redDoor', + ids: [0x19, 0x1B, 0x20, 0x21], + }, + { + name: 'blueDoor', + ids: [0x16, 0x1F, 0x1E, 0x17], + }, + ], + } +} diff --git a/scissors/src/visions/index.js b/scissors/src/visions/index.js index e767920..6adbf19 100644 --- a/scissors/src/visions/index.js +++ b/scissors/src/visions/index.js @@ -1,17 +1,19 @@ import vision11 from './1-1' import vision12 from './1-2' import vision13 from './1-3' +import vision15 from './1-5' const vision = { 1: { 1: vision11, 2: vision12, 3: vision13, + 5: vision15, }, } const loadVisionInfo = (world, index) => vision[world][index] -const allVisions = [vision11, vision12, vision13] +const allVisions = [vision11, vision12, vision13, vision15] export { loadVisionInfo, allVisions }