Skip to content

Commit 94487a7

Browse files
authored
Merge pull request #2042 from kjbranch/helper_rename_2
Standardize capitalization in helper names
2 parents b49ada3 + cd44e5c commit 94487a7

246 files changed

Lines changed: 1035 additions & 1035 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.

helpers.json

Lines changed: 56 additions & 56 deletions
Large diffs are not rendered by default.

region/brinstar/blue/Billy Mays Room.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"link": [1, 1],
8787
"name": "Crystal Flash",
8888
"requires": [
89-
"h_crystalFlash"
89+
"h_CrystalFlash"
9090
],
9191
"flashSuitChecked": true
9292
},

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
"link": [1, 1],
146146
"name": "Crystal Flash",
147147
"requires": [
148-
"h_crystalFlash"
148+
"h_CrystalFlash"
149149
],
150150
"flashSuitChecked": true
151151
},
@@ -752,7 +752,7 @@
752752
"link": [2, 2],
753753
"name": "Crystal Flash",
754754
"requires": [
755-
"h_crystalFlash"
755+
"h_CrystalFlash"
756756
],
757757
"flashSuitChecked": true
758758
},
@@ -886,7 +886,7 @@
886886
"Gravity",
887887
{"canShineCharge": {"usedTiles": 19, "openEnd": 2}},
888888
{"spikeHits": 1},
889-
"h_SpikeSuitSpikeHitLeniency",
889+
"h_spikeSuitSpikeHitLeniency",
890890
"canSpikeSuit",
891891
{"shinespark": {"frames": 6, "excessFrames": 6}}
892892
],

region/brinstar/blue/Blue Brinstar Energy Tank Room.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@
536536
"link": [1, 1],
537537
"name": "Crystal Flash",
538538
"requires": [
539-
"h_crystalFlash"
539+
"h_CrystalFlash"
540540
],
541541
"clearsObstacles": ["C"],
542542
"flashSuitChecked": true
@@ -825,7 +825,7 @@
825825
"h_destroyBombWalls",
826826
{"obstaclesCleared": ["A"]}
827827
]},
828-
"h_usePowerBombs",
828+
"h_usePowerBomb",
829829
{"canShineCharge": {"usedTiles": 42, "openEnd": 0}},
830830
{"shinespark": {"frames": 43}}
831831
],
@@ -854,7 +854,7 @@
854854
"link": [2, 2],
855855
"name": "Crystal Flash",
856856
"requires": [
857-
"h_crystalFlash"
857+
"h_CrystalFlash"
858858
],
859859
"clearsObstacles": ["A"],
860860
"flashSuitChecked": true
@@ -910,7 +910,7 @@
910910
"name": "Broken Power Bomb Blocks",
911911
"requires": [
912912
{"or": [
913-
"h_usePowerBombs",
913+
"h_usePowerBomb",
914914
{"obstaclesCleared": ["C"]}
915915
]}
916916
],
@@ -950,7 +950,7 @@
950950
"name": "Base",
951951
"requires": [
952952
{"or": [
953-
"h_usePowerBombs",
953+
"h_usePowerBomb",
954954
{"obstaclesCleared": ["C"]}
955955
]},
956956
{"or": [
@@ -960,7 +960,7 @@
960960
]},
961961
{"or": [
962962
{"and": [
963-
"h_usePowerBombs",
963+
"h_usePowerBomb",
964964
"canTrivialMidAirMorph"
965965
]},
966966
"ScrewAttack"
@@ -976,7 +976,7 @@
976976
"name": "Power Bomb and Bombs",
977977
"requires": [
978978
{"or": [
979-
"h_usePowerBombs",
979+
"h_usePowerBomb",
980980
{"obstaclesCleared": ["C"]}
981981
]},
982982
"h_useMorphBombs",
@@ -999,7 +999,7 @@
999999
"requires": [
10001000
"h_ZebesIsAwake",
10011001
{"or": [
1002-
"h_usePowerBombs",
1002+
"h_usePowerBomb",
10031003
{"and": [
10041004
{"obstaclesCleared": ["B"]},
10051005
"Morph"
@@ -1031,14 +1031,14 @@
10311031
"requires": [
10321032
"h_ZebesIsAwake",
10331033
{"or": [
1034-
"h_usePowerBombs",
1034+
"h_usePowerBomb",
10351035
{"and": [
10361036
{"obstaclesCleared": ["B"]},
10371037
"Morph"
10381038
]},
10391039
{"obstaclesCleared": ["C"]}
10401040
]},
1041-
"h_usePowerBombs",
1041+
"h_usePowerBomb",
10421042
"canTrivialMidAirMorph",
10431043
"canTrickyUseFrozenEnemies",
10441044
"canTrickyJump",
@@ -1059,7 +1059,7 @@
10591059
"name": "Shinespark",
10601060
"requires": [
10611061
{"or": [
1062-
"h_usePowerBombs",
1062+
"h_usePowerBomb",
10631063
{"obstaclesCleared": ["C"]}
10641064
]},
10651065
{"canShineCharge": {"usedTiles": 42, "openEnd": 0}},
@@ -1075,7 +1075,7 @@
10751075
"name": "Wall Jump Spark",
10761076
"requires": [
10771077
{"or": [
1078-
"h_usePowerBombs",
1078+
"h_usePowerBomb",
10791079
{"obstaclesCleared": ["C"]}
10801080
]},
10811081
{"canShineCharge": {"usedTiles": 42, "openEnd": 0}},
@@ -1098,7 +1098,7 @@
10981098
"requires": [
10991099
{"notable": "Fast Wall Jump Spark"},
11001100
{"or": [
1101-
"h_usePowerBombs",
1101+
"h_usePowerBomb",
11021102
{"obstaclesCleared": ["C"]}
11031103
]},
11041104
{"canShineCharge": {"usedTiles": 42, "openEnd": 0}},
@@ -1120,7 +1120,7 @@
11201120
"requires": [
11211121
{"notable": "Fast Wall Jump Spark"},
11221122
{"or": [
1123-
"h_usePowerBombs",
1123+
"h_usePowerBomb",
11241124
{"obstaclesCleared": ["C"]}
11251125
]},
11261126
{"canShineCharge": {"usedTiles": 42, "openEnd": 0}},

region/brinstar/blue/Construction Zone.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
"link": [1, 1],
136136
"name": "Crystal Flash",
137137
"requires": [
138-
"h_crystalFlash"
138+
"h_CrystalFlash"
139139
],
140140
"flashSuitChecked": true
141141
},

region/brinstar/blue/First Missile Room.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"link": [1, 1],
6969
"name": "Crystal Flash",
7070
"requires": [
71-
"h_crystalFlash"
71+
"h_CrystalFlash"
7272
],
7373
"flashSuitChecked": true
7474
},

region/brinstar/blue/Morph Ball Room.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
"requires": [
109109
{"or": [
110110
"h_ZebesIsAwake",
111-
"h_AllItemsSpawned"
111+
"h_allItemsSpawned"
112112
]}
113113
]
114114
}
@@ -369,7 +369,7 @@
369369
"name": "Crystal Flash",
370370
"requires": [
371371
{"obstaclesCleared": ["C"]},
372-
"h_crystalFlash"
372+
"h_CrystalFlash"
373373
],
374374
"flashSuitChecked": true
375375
},
@@ -456,7 +456,7 @@
456456
{"or": [
457457
"Plasma",
458458
{"and": [
459-
"h_usePowerBombs",
459+
"h_usePowerBomb",
460460
{"or": [
461461
"canTrickyDodgeEnemies",
462462
{"enemyKill": {
@@ -609,7 +609,7 @@
609609
"Plasma",
610610
"ScrewAttack",
611611
{"and": [
612-
"h_usePowerBombs",
612+
"h_usePowerBomb",
613613
{"enemyKill": {
614614
"enemies": [["Sidehopper"]],
615615
"explicitWeapons": ["Missile", "Super", "PowerBomb"]
@@ -1229,7 +1229,7 @@
12291229
"link": [4, 4],
12301230
"name": "Crystal Flash",
12311231
"requires": [
1232-
"h_crystalFlash"
1232+
"h_CrystalFlash"
12331233
],
12341234
"clearsObstacles": ["B"],
12351235
"flashSuitChecked": true
@@ -1240,7 +1240,7 @@
12401240
"name": "Base",
12411241
"requires": [
12421242
{"or": [
1243-
"h_usePowerBombs",
1243+
"h_usePowerBomb",
12441244
{"obstaclesCleared": ["B"]}
12451245
]}
12461246
],
@@ -1281,7 +1281,7 @@
12811281
{"or": [
12821282
"Wave",
12831283
"canDodgeWhileShooting",
1284-
"h_usePowerBombs",
1284+
"h_usePowerBomb",
12851285
"ScrewAttack"
12861286
]},
12871287
{"obstaclesCleared": ["A"]}
@@ -1296,7 +1296,7 @@
12961296
"name": "Base",
12971297
"requires": [
12981298
{"or": [
1299-
"h_usePowerBombs",
1299+
"h_usePowerBomb",
13001300
{"obstaclesCleared": ["B"]}
13011301
]}
13021302
],

region/brinstar/green/Brinstar Map Room.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"link": [1, 1],
6969
"name": "Crystal Flash",
7070
"requires": [
71-
"h_crystalFlash"
71+
"h_CrystalFlash"
7272
],
7373
"flashSuitChecked": true
7474
},

region/brinstar/green/Brinstar Pre-Map Room.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
"link": [1, 1],
133133
"name": "Crystal Flash",
134134
"requires": [
135-
"h_crystalFlash"
135+
"h_CrystalFlash"
136136
],
137137
"clearsObstacles": ["A"],
138138
"flashSuitChecked": true
@@ -445,7 +445,7 @@
445445
"link": [2, 2],
446446
"name": "Crystal Flash",
447447
"requires": [
448-
"h_crystalFlash"
448+
"h_CrystalFlash"
449449
],
450450
"clearsObstacles": ["A"],
451451
"flashSuitChecked": true

region/brinstar/green/Brinstar Reserve Tank Room.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
"link": [1, 1],
115115
"name": "Crystal Flash",
116116
"requires": [
117-
"h_crystalFlash"
117+
"h_CrystalFlash"
118118
],
119119
"flashSuitChecked": true
120120
},

0 commit comments

Comments
 (0)