Skip to content

Commit fa8f2d2

Browse files
kjbranchkjbranch
committed
norfair, ws, tourian
1 parent c45ac2d commit fa8f2d2

28 files changed

Lines changed: 308 additions & 312 deletions

‎region/norfair/crocomire/Grapple Tutorial Room 3.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -333,9 +333,9 @@
333333
{
334334
"id": 11,
335335
"link": [1, 3],
336-
"name": "Grapple Tutorial 3 Frozen Gamet Bridge",
336+
"name": "Frozen Gamet Bridge",
337337
"requires": [
338-
{"notable": "Grapple Tutorial 3 Frozen Gamet Bridge"},
338+
{"notable": "Frozen Gamet Bridge"},
339339
"canTrickyUseFrozenEnemies"
340340
],
341341
"note": [
@@ -347,9 +347,9 @@
347347
{
348348
"id": 12,
349349
"link": [1, 3],
350-
"name": "Grapple Tutorial 3 Double Gamet Boost",
350+
"name": "Double Gamet Boost",
351351
"requires": [
352-
{"notable": "Grapple Tutorial 3 Double Gamet Boost"},
352+
{"notable": "Double Gamet Boost"},
353353
"h_canNavigateUnderwater",
354354
"canTrickyJump",
355355
"canHorizontalDamageBoost",
@@ -945,7 +945,7 @@
945945
"notables": [
946946
{
947947
"id": 1,
948-
"name": "Grapple Tutorial 3 Frozen Gamet Bridge",
948+
"name": "Frozen Gamet Bridge",
949949
"note": [
950950
"Lead a Gamet up through the water and freeze it to cross the first moat.",
951951
"Freeze the Gamet before it starts moving left.",
@@ -954,7 +954,7 @@
954954
},
955955
{
956956
"id": 2,
957-
"name": "Grapple Tutorial 3 Double Gamet Boost",
957+
"name": "Double Gamet Boost",
958958
"note": [
959959
"1- Stand near the farm point, on the edge of where you make Gamets spawn.",
960960
"2- Wait for the water position to be high.",

‎region/norfair/crocomire/Post Crocomire Farming Room.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1216,9 +1216,9 @@
12161216
{
12171217
"id": 56,
12181218
"link": [5, 1],
1219-
"name": "Post Crocomire Farming Room Speed Jump",
1219+
"name": "Speedy Jump",
12201220
"requires": [
1221-
{"notable": "Post Crocomire Farming Room Speed Jump"},
1221+
{"notable": "Speedy Jump"},
12221222
"canTrickyDashJump",
12231223
"canWalljump"
12241224
],
@@ -1275,9 +1275,9 @@
12751275
{
12761276
"id": 59,
12771277
"link": [5, 1],
1278-
"name": "Post Crocomire Farming Room Damage Boost",
1278+
"name": "Damage Boost",
12791279
"requires": [
1280-
{"notable": "Post Crocomire Farming Room Damage Boost"},
1280+
{"notable": "Damage Boost"},
12811281
"canTrickyJump",
12821282
{"or": [
12831283
"h_canCrouchJumpDownGrab",
@@ -1632,15 +1632,15 @@
16321632
"notables": [
16331633
{
16341634
"id": 1,
1635-
"name": "Post Crocomire Farming Room Speed Jump",
1635+
"name": "Speedy Jump",
16361636
"note": [
16371637
"Doesn't require opening the bottom right door. Just using the available space and jumping late enough.",
16381638
"It does require killing the Gamets and leaving the drops there so they don't kill your momentum."
16391639
]
16401640
},
16411641
{
16421642
"id": 2,
1643-
"name": "Post Crocomire Farming Room Damage Boost",
1643+
"name": "Damage Boost",
16441644
"note": "Use the moving platform (Kamer) to elevate the Gamets."
16451645
}
16461646
],

‎region/norfair/crocomire/Post Crocomire Jump Room.json‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -163,15 +163,15 @@
163163
{
164164
"id": 3,
165165
"link": [1, 2],
166-
"name": "PCJR Full Room Space Jump Through Speed Blocks",
166+
"name": "Full Room Space Jump Through Speed Blocks",
167167
"entranceCondition": {
168168
"comeInGettingBlueSpeed": {
169169
"length": 9,
170170
"openEnd": 0
171171
}
172172
},
173173
"requires": [
174-
{"notable": "PCJR Full Room Space Jump Through Speed Blocks"},
174+
{"notable": "Full Room Space Jump Through Speed Blocks"},
175175
"canBlueSpaceJump",
176176
"canPreciseSpaceJump"
177177
],
@@ -293,14 +293,14 @@
293293
{
294294
"id": 10,
295295
"link": [1, 3],
296-
"name": "PCJR Left Side Diagonal Shinespark",
296+
"name": "Left Side Diagonal Shinespark",
297297
"entranceCondition": {
298298
"comeInShinecharged": {
299299
"framesRequired": 175
300300
}
301301
},
302302
"requires": [
303-
{"notable": "PCJR Left Side Diagonal Shinespark"},
303+
{"notable": "Left Side Diagonal Shinespark"},
304304
"canTrickyJump",
305305
"canShinechargeMovementComplex",
306306
"canMidairShinespark",
@@ -317,7 +317,7 @@
317317
"link": [1, 3],
318318
"name": "Indiana Jones Grapple",
319319
"requires": [
320-
{"notable": "PCJR Indiana Jones Grapple"},
320+
{"notable": "Indiana Jones Grapple"},
321321
"canUseEnemies",
322322
"canPreciseGrapple"
323323
],
@@ -363,15 +363,15 @@
363363
{
364364
"id": 15,
365365
"link": [1, 6],
366-
"name": "PCJR G-Mode Morph Long Diagonal Bomb Jump (Indirect)",
366+
"name": "G-Mode Morph Long Diagonal Bomb Jump (Indirect)",
367367
"entranceCondition": {
368368
"comeInWithGMode": {
369369
"mode": "indirect",
370370
"morphed": true
371371
}
372372
},
373373
"requires": [
374-
{"notable": "PCJR G-Mode Morph Long Diagonal Bomb Jump"},
374+
{"notable": "G-Mode Morph Long Diagonal Bomb Jump"},
375375
"h_canArtificialMorphDiagonalBombJump"
376376
],
377377
"flashSuitChecked": true,
@@ -380,15 +380,15 @@
380380
{
381381
"id": 16,
382382
"link": [1, 6],
383-
"name": "PCJR G-Mode Morph Long Diagonal Bomb Jump (Direct)",
383+
"name": "G-Mode Morph Long Diagonal Bomb Jump (Direct)",
384384
"entranceCondition": {
385385
"comeInWithGMode": {
386386
"mode": "direct",
387387
"morphed": true
388388
}
389389
},
390390
"requires": [
391-
{"notable": "PCJR G-Mode Morph Long Diagonal Bomb Jump"},
391+
{"notable": "G-Mode Morph Long Diagonal Bomb Jump"},
392392
"h_canArtificialMorphDiagonalBombJump"
393393
],
394394
"clearsObstacles": ["D"],
@@ -456,9 +456,9 @@
456456
{
457457
"id": 19,
458458
"link": [2, 1],
459-
"name": "PCJR Big Jump Shinespark",
459+
"name": "Big Jump Shinespark",
460460
"requires": [
461-
{"notable": "PCJR Big Jump Shinespark"},
461+
{"notable": "Big Jump Shinespark"},
462462
"canShinechargeMovementComplex",
463463
"canMidairShinespark",
464464
{"obstaclesCleared": ["B"]},
@@ -961,7 +961,7 @@
961961
"link": [3, 1],
962962
"name": "Indiana Jones Grapple in Reverse",
963963
"requires": [
964-
{"notable": "PCJR Indiana Jones Grapple"},
964+
{"notable": "Indiana Jones Grapple"},
965965
"canUseEnemies",
966966
"canPreciseGrapple"
967967
],
@@ -1122,9 +1122,9 @@
11221122
{
11231123
"id": 58,
11241124
"link": [5, 2],
1125-
"name": "PCJR Acid Shinespark",
1125+
"name": "Acid Shinespark",
11261126
"requires": [
1127-
{"notable": "PCJR Acid Shinespark"},
1127+
{"notable": "Acid Shinespark"},
11281128
"Gravity",
11291129
"canSuitlessLavaDive",
11301130
"canShinechargeMovement",
@@ -1170,9 +1170,9 @@
11701170
{
11711171
"id": 61,
11721172
"link": [5, 3],
1173-
"name": "PCJR Springwall",
1173+
"name": "Springwall",
11741174
"requires": [
1175-
{"notable": "PCJR Springwall"},
1175+
{"notable": "Springwall"},
11761176
"HiJump",
11771177
"h_canTrickySpringwall",
11781178
"canPreciseWalljump",
@@ -1230,9 +1230,9 @@
12301230
{
12311231
"id": 64,
12321232
"link": [5, 3],
1233-
"name": "Indy Jones Mella Ice Clip",
1233+
"name": "Mella Ice Clip",
12341234
"requires": [
1235-
{"notable": "Indy Jones Mella Ice Clip"},
1235+
{"notable": "Mella Ice Clip"},
12361236
"Morph",
12371237
{"or": [
12381238
"h_canXRayMorphIceClip",
@@ -1348,40 +1348,40 @@
13481348
"notables": [
13491349
{
13501350
"id": 1,
1351-
"name": "PCJR Indiana Jones Grapple",
1351+
"name": "Indiana Jones Grapple",
13521352
"note": "Involves grappling off several Rippers, where falling may lead to a soft lock."
13531353
},
13541354
{
13551355
"id": 2,
1356-
"name": "PCJR G-Mode Morph Long Diagonal Bomb Jump",
1356+
"name": "G-Mode Morph Long Diagonal Bomb Jump",
13571357
"note": "Perform a long diagonal bomb jump from the left door to the solid platforms above the acid."
13581358
},
13591359
{
13601360
"id": 3,
1361-
"name": "PCJR Full Room Space Jump Through Speed Blocks",
1361+
"name": "Full Room Space Jump Through Speed Blocks",
13621362
"note": "The blocks can be broken if you can generate a blue suit using the previous room's runway, and carry it to the blocks by slowing floating down with Space Jump."
13631363
},
13641364
{
13651365
"id": 4,
1366-
"name": "PCJR Left Side Diagonal Shinespark",
1366+
"name": "Left Side Diagonal Shinespark",
13671367
"note": [
13681368
"Store a shinespark near the Grapple Room door and use the remaining runway to jump as far as possible to the right.",
13691369
"Once near the acid platforms, Shinespark diagonally to reach the Missile Location."
13701370
]
13711371
},
13721372
{
13731373
"id": 5,
1374-
"name": "PCJR Big Jump Shinespark",
1374+
"name": "Big Jump Shinespark",
13751375
"note": "Charge a spark to the right, then come back, run and jump, and do a horizontal spark at the apex."
13761376
},
13771377
{
13781378
"id": 6,
1379-
"name": "PCJR Acid Shinespark",
1379+
"name": "Acid Shinespark",
13801380
"note": "Gravity makes it possible to charge a spark in the acid in order to break the speed blocks."
13811381
},
13821382
{
13831383
"id": 7,
1384-
"name": "PCJR Springwall",
1384+
"name": "Springwall",
13851385
"note": [
13861386
"A particularly precise springwall.",
13871387
"Aim the walljump at the bottom of the second sloped wall fixture, where it looks like you cant jump off of.",
@@ -1390,7 +1390,7 @@
13901390
},
13911391
{
13921392
"id": 8,
1393-
"name": "Indy Jones Mella Ice Clip",
1393+
"name": "Mella Ice Clip",
13941394
"note": [
13951395
"Freeze the Mella at a precise location in order to jump through the crumble block, then wall jump up the long channel and mid air morph to get out.",
13961396
"The Mella pixel positioning window is larger and higher with Morph and an X-Ray Stand Up."

‎region/norfair/east/Bubble Mountain.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -682,9 +682,9 @@
682682
{
683683
"id": 13,
684684
"link": [1, 7],
685-
"name": "Bubble Mountain Damage Boost (Left to Right)",
685+
"name": "Damage Boost (Left to Right)",
686686
"requires": [
687-
{"notable": "Bubble Mountain Damage Boost"},
687+
{"notable": "Damage Boost"},
688688
"canHorizontalDamageBoost",
689689
{"enemyDamage": {
690690
"enemy": "Waver",
@@ -3357,9 +3357,9 @@
33573357
{
33583358
"id": 117,
33593359
"link": [7, 1],
3360-
"name": "Bubble Mountain Damage Boost (Right to Left)",
3360+
"name": "Damage Boost (Right to Left)",
33613361
"requires": [
3362-
{"notable": "Bubble Mountain Damage Boost"},
3362+
{"notable": "Damage Boost"},
33633363
"canHorizontalDamageBoost",
33643364
{"enemyDamage": {
33653365
"enemy": "Waver",
@@ -4061,9 +4061,9 @@
40614061
{
40624062
"id": 148,
40634063
"link": [9, 1],
4064-
"name": "Bubble Mountain Tricky Spring Ball Jump with Grapple",
4064+
"name": "Tricky Spring Ball Jump with Grapple",
40654065
"requires": [
4066-
{"notable": "Bubble Mountain Tricky Spring Ball Jump with Grapple"},
4066+
{"notable": "Tricky Spring Ball Jump with Grapple"},
40674067
"canTrickySpringBallJump",
40684068
"canPreciseGrapple"
40694069
],
@@ -4149,9 +4149,9 @@
41494149
{
41504150
"id": 157,
41514151
"link": [9, 7],
4152-
"name": "Bubble Mountain Right Side Delayed Walljumps",
4152+
"name": "Right Side Delayed Walljumps",
41534153
"requires": [
4154-
{"notable": "Bubble Mountain Right Side Delayed Walljumps"},
4154+
{"notable": "Right Side Delayed Walljumps"},
41554155
"canDelayedWalljump",
41564156
"canConsecutiveWalljump"
41574157
],
@@ -4245,20 +4245,20 @@
42454245
"notables": [
42464246
{
42474247
"id": 1,
4248-
"name": "Bubble Mountain Damage Boost",
4248+
"name": "Damage Boost",
42494249
"note": "Crossing between the topmost doors of Bubble Mountain by damage boosting using a Waver."
42504250
},
42514251
{
42524252
"id": 2,
4253-
"name": "Bubble Mountain Tricky Spring Ball Jump with Grapple",
4253+
"name": "Tricky Spring Ball Jump with Grapple",
42544254
"note": [
42554255
"Perform a very tight Spring Ball jump from the Save room door runway, starting from either a crouch or spin jump,",
42564256
"then use Grapple to barely reach the ceiling blocks."
42574257
]
42584258
},
42594259
{
42604260
"id": 3,
4261-
"name": "Bubble Mountain Right Side Delayed Walljumps",
4261+
"name": "Right Side Delayed Walljumps",
42624262
"note": "A tricky, delayed walljump makes it possible to climb to top right in-room, with nothing."
42634263
}
42644264
],

0 commit comments

Comments
 (0)