Skip to content

Commit 6ea558c

Browse files
osse101osse101
authored
Merge pull request #2852 from kjbranch/rename-canwalljump
Capitalize J in canWallJump
2 parents b63fb4d + 4fe3977 commit 6ea558c

111 files changed

Lines changed: 732 additions & 732 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎region/brinstar/blue/Blue Brinstar Boulder Room.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -956,7 +956,7 @@
956956
"requires": [
957957
"SpaceJump",
958958
{"or": [
959-
"canWalljump",
959+
"canWallJump",
960960
{"and": [
961961
"canSpaceJumpWaterEscape",
962962
"HiJump"
@@ -1037,7 +1037,7 @@
10371037
{"doorUnlockedAtNode": 2},
10381038
{"or": [
10391039
"canDownGrab",
1040-
"canWalljump",
1040+
"canWallJump",
10411041
"Gravity",
10421042
"HiJump",
10431043
"canTrickySpringBallJump"

‎region/brinstar/blue/Morph Ball Room.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1792,7 +1792,7 @@
17921792
"name": "Base",
17931793
"requires": [
17941794
{"or": [
1795-
"canWalljump",
1795+
"canWallJump",
17961796
"Morph",
17971797
"SpaceJump",
17981798
"HiJump"

‎region/brinstar/green/Early Supers Room.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@
281281
"requires": [
282282
"canComplexGMode",
283283
{"or": [
284-
"canWalljump",
284+
"canWallJump",
285285
"SpaceJump",
286286
{"and": [
287287
"HiJump",
@@ -448,7 +448,7 @@
448448
"types": ["missiles", "powerbomb"],
449449
"requires": [
450450
{"or": [
451-
"canWalljump",
451+
"canWallJump",
452452
"HiJump",
453453
"SpaceJump",
454454
"canIBJ",
@@ -484,7 +484,7 @@
484484
"types": ["powerbomb"],
485485
"requires": [
486486
{"or": [
487-
"canWalljump",
487+
"canWallJump",
488488
"HiJump",
489489
"SpaceJump",
490490
"canIBJ",
@@ -626,7 +626,7 @@
626626
"canOffScreenMovement",
627627
"canComplexGMode",
628628
{"or": [
629-
"canWalljump",
629+
"canWallJump",
630630
"SpaceJump",
631631
{"and": [
632632
"HiJump",
@@ -709,7 +709,7 @@
709709
"requires": [
710710
{"refill": ["Energy"]},
711711
{"or": [
712-
"canWalljump",
712+
"canWallJump",
713713
"HiJump",
714714
"SpaceJump",
715715
"canIBJ",
@@ -931,7 +931,7 @@
931931
"name": "Leave Shinecharged (Run Above)",
932932
"requires": [
933933
{"or": [
934-
"canWalljump",
934+
"canWallJump",
935935
"HiJump",
936936
"SpaceJump",
937937
"canIBJ",
@@ -1037,7 +1037,7 @@
10371037
"requires": [
10381038
{"resetRoom": {"nodes": [2]}},
10391039
{"or": [
1040-
"canWalljump",
1040+
"canWallJump",
10411041
{"and": [
10421042
"canCrouchJump",
10431043
{"or": [
@@ -1224,7 +1224,7 @@
12241224
},
12251225
"requires": [
12261226
{"or": [
1227-
"canWalljump",
1227+
"canWallJump",
12281228
"HiJump",
12291229
"SpaceJump",
12301230
"canIBJ",
@@ -1259,7 +1259,7 @@
12591259
"name": "Base",
12601260
"requires": [
12611261
{"or": [
1262-
"canWalljump",
1262+
"canWallJump",
12631263
"HiJump",
12641264
"SpaceJump",
12651265
"canIBJ",

‎region/brinstar/green/Etecoon Energy Tank Room.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -933,14 +933,14 @@
933933
{"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}},
934934
{"or": [
935935
"h_preciseIceClip",
936-
"canWalljump",
936+
"canWallJump",
937937
"HiJump",
938938
"SpaceJump",
939939
{"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}}
940940
]},
941941
{"or": [
942942
"canCrumbleJump",
943-
"canWalljump",
943+
"canWallJump",
944944
"HiJump",
945945
"SpaceJump"
946946
]}
@@ -968,7 +968,7 @@
968968
"Morph",
969969
{"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}},
970970
{"or": [
971-
"canWalljump",
971+
"canWallJump",
972972
"HiJump",
973973
"SpaceJump",
974974
{"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}}
@@ -1366,7 +1366,7 @@
13661366
]},
13671367
{"ammo": {"type": "PowerBomb", "count": 2}},
13681368
{"or": [
1369-
"canWalljump",
1369+
"canWallJump",
13701370
"SpaceJump",
13711371
{"and": [
13721372
"HiJump",
@@ -1500,7 +1500,7 @@
15001500
]},
15011501
{"ammo": {"type": "PowerBomb", "count": 2}},
15021502
{"or": [
1503-
"canWalljump",
1503+
"canWallJump",
15041504
"SpaceJump",
15051505
{"and": [
15061506
"HiJump",
@@ -1948,7 +1948,7 @@
19481948
]},
19491949
{"ammo": {"type": "PowerBomb", "count": 2}},
19501950
{"or": [
1951-
"canWalljump",
1951+
"canWallJump",
19521952
"SpaceJump",
19531953
{"and": [
19541954
"HiJump",
@@ -1990,7 +1990,7 @@
19901990
]},
19911991
{"ammo": {"type": "PowerBomb", "count": 2}},
19921992
{"or": [
1993-
"canWalljump",
1993+
"canWallJump",
19941994
"SpaceJump",
19951995
{"and": [
19961996
"HiJump",
@@ -2306,7 +2306,7 @@
23062306
"Morph",
23072307
{"or": [
23082308
"HiJump",
2309-
"canWalljump"
2309+
"canWallJump"
23102310
]}
23112311
]}
23122312
]}
@@ -2342,7 +2342,7 @@
23422342
"Morph",
23432343
{"or": [
23442344
"HiJump",
2345-
"canWalljump"
2345+
"canWallJump"
23462346
]}
23472347
]}
23482348
]}
@@ -2391,7 +2391,7 @@
23912391
]},
23922392
{"ammo": {"type": "PowerBomb", "count": 2}},
23932393
{"or": [
2394-
"canWalljump",
2394+
"canWallJump",
23952395
"SpaceJump",
23962396
{"and": [
23972397
"HiJump",
@@ -2432,7 +2432,7 @@
24322432
]},
24332433
{"ammo": {"type": "PowerBomb", "count": 2}},
24342434
{"or": [
2435-
"canWalljump",
2435+
"canWallJump",
24362436
"SpaceJump",
24372437
{"and": [
24382438
"HiJump",

‎region/brinstar/green/Green Brinstar Main Shaft.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1489,7 +1489,7 @@
14891489
}
14901490
},
14911491
"requires": [
1492-
"canWalljump",
1492+
"canWallJump",
14931493
"canShinechargeMovementComplex",
14941494
{"shineChargeFrames": 135}
14951495
],
@@ -1537,7 +1537,7 @@
15371537
"requires": [
15381538
{"shineChargeFrames": 105},
15391539
"HiJump",
1540-
"canWalljump",
1540+
"canWallJump",
15411541
"canShinechargeMovementComplex"
15421542
],
15431543
"exitCondition": {
@@ -1581,7 +1581,7 @@
15811581
},
15821582
"requires": [
15831583
{"shineChargeFrames": 130},
1584-
"canWalljump",
1584+
"canWallJump",
15851585
"canShinechargeMovementComplex"
15861586
],
15871587
"exitCondition": {
@@ -1625,7 +1625,7 @@
16251625
"requires": [
16261626
{"shineChargeFrames": 80},
16271627
"HiJump",
1628-
"canWalljump",
1628+
"canWallJump",
16291629
"canShinechargeMovementComplex",
16301630
{"shinespark": {"frames": 7, "excessFrames": 0}}
16311631
],
@@ -1671,7 +1671,7 @@
16711671
},
16721672
"requires": [
16731673
{"shineChargeFrames": 110},
1674-
"canWalljump",
1674+
"canWallJump",
16751675
"canShinechargeMovementComplex",
16761676
{"shinespark": {"frames": 6, "excessFrames": 0}}
16771677
],
@@ -1832,7 +1832,7 @@
18321832
},
18331833
"requires": [
18341834
{"shineChargeFrames": 145},
1835-
"canWalljump",
1835+
"canWallJump",
18361836
"canShinechargeMovementComplex"
18371837
],
18381838
"exitCondition": {
@@ -2505,7 +2505,7 @@
25052505
},
25062506
"requires": [
25072507
{"shineChargeFrames": 130},
2508-
"canWalljump",
2508+
"canWallJump",
25092509
"canShinechargeMovementComplex"
25102510
],
25112511
"exitCondition": {
@@ -2570,7 +2570,7 @@
25702570
},
25712571
"requires": [
25722572
{"shineChargeFrames": 110},
2573-
"canWalljump",
2573+
"canWallJump",
25742574
"canShinechargeMovementComplex",
25752575
{"shinespark": {"frames": 6, "excessFrames": 0}}
25762576
],
@@ -3209,7 +3209,7 @@
32093209
}
32103210
},
32113211
"requires": [
3212-
"canWalljump",
3212+
"canWallJump",
32133213
"canShinechargeMovementComplex",
32143214
{"shineChargeFrames": 125}
32153215
],
@@ -3234,7 +3234,7 @@
32343234
}
32353235
},
32363236
"requires": [
3237-
"canWalljump",
3237+
"canWallJump",
32383238
"canShinechargeMovementComplex",
32393239
{"shineChargeFrames": 145}
32403240
],
@@ -5286,7 +5286,7 @@
52865286
"name": "Base",
52875287
"requires": [
52885288
{"or": [
5289-
"canWalljump",
5289+
"canWallJump",
52905290
"SpaceJump",
52915291
"canLongIBJ",
52925292
{"and": [

‎region/brinstar/green/Green Hill Zone.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
{"shineChargeFrames": 130}
182182
]},
183183
{"and": [
184-
"canWalljump",
184+
"canWallJump",
185185
{"shineChargeFrames": 170}
186186
]},
187187
{"shineChargeFrames": 175}
@@ -335,7 +335,7 @@
335335
"canSpringBallJumpMidAir",
336336
{"and": [
337337
"canSpeedyJump",
338-
"canWalljump"
338+
"canWallJump"
339339
]}
340340
]}
341341
],
@@ -888,7 +888,7 @@
888888
"SpaceJump",
889889
"canLongIBJ",
890890
"canJumpIntoIBJ",
891-
"canWalljump",
891+
"canWallJump",
892892
"canUseFrozenEnemies",
893893
"canSpringBallJumpMidAir"
894894
]}
@@ -1146,7 +1146,7 @@
11461146
]},
11471147
{"and": [
11481148
"canTrickyDashJump",
1149-
"canWalljump",
1149+
"canWallJump",
11501150
"canShinechargeMovementTricky",
11511151
{"shineChargeFrames": 155}
11521152
]}

‎region/brinstar/kraid/Kraid Room.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
]},
138138
{"or": [
139139
"HiJump",
140-
"canWalljump",
140+
"canWallJump",
141141
"SpaceJump",
142142
"canSpringBallJumpMidAir",
143143
{"and": [
@@ -163,7 +163,7 @@
163163
{"ammo": {"type": "Missile", "count": 2}},
164164
{"or": [
165165
"HiJump",
166-
"canWalljump",
166+
"canWallJump",
167167
"SpaceJump",
168168
"canSpringBallJumpMidAir",
169169
{"and": [
@@ -208,7 +208,7 @@
208208
]},
209209
{"or": [
210210
"HiJump",
211-
"canWalljump",
211+
"canWallJump",
212212
"SpaceJump",
213213
"canSpringBallJumpMidAir",
214214
{"and": [
@@ -321,7 +321,7 @@
321321
]},
322322
{"or": [
323323
"HiJump",
324-
"canWalljump",
324+
"canWallJump",
325325
"SpaceJump",
326326
"canSpringBallJumpMidAir",
327327
{"and": [
@@ -601,7 +601,7 @@
601601
]},
602602
{"or": [
603603
"HiJump",
604-
"canWalljump",
604+
"canWallJump",
605605
"SpaceJump",
606606
"canSpringBallJumpMidAir",
607607
{"and": [

0 commit comments

Comments
 (0)