Allow door event flags for grey doors to work

src/flagmenu.asm

@@ -792,7 +792,7 @@ eventflags_setbosses:
     RTL
 
 eventflags_setdoors:
-    %cm_jsl("Set All Doors", .routine, #$0000)
+    %cm_jsl("Set All Doors Unlocked", .routine, #$0000)
   .routine
     TDC : DEC : LDX #$0040
   .loop
@@ -1973,13 +1973,13 @@ doors_004A_uppernorfair:
     %cm_toggle_bit_inverted("Cathedral Entrance", #$7ED8B8, #$0400, #0)
 
 doors_004B_uppernorfair:
-    %cm_toggle_bit_inverted("Business Center (Green)", #$7ED8B8, #$0800, #0)
+    %cm_toggle_bit_inverted("Business Center(Green)", #$7ED8B8, #$0800, #0)
 
 doors_004C_uppernorfair:
-    %cm_toggle_bit_inverted("Business Center (Yellow)", #$7ED8B8, #$1000, #0)
+    %cm_toggle_bit_inverted("Business Center(Yellow)", #$7ED8B8, #$1000, #0)
 
 doors_004D_uppernorfair:
-    %cm_toggle_bit_inverted("Business Center (Red)", #$7ED8B8, #$2000, #0)
+    %cm_toggle_bit_inverted("Business Center(Red)", #$7ED8B8, #$2000, #0)
 
 doors_004E_uppernorfair:
     %cm_toggle_bit_inverted("Crocomire Speedway", #$7ED8B8, #$4000, #0)
@@ -1997,10 +1997,10 @@ doors_0052_uppernorfair:
     %cm_toggle_bit_inverted("Post Croc Shaft", #$7ED8BA, #$0004, #0)
 
 doors_0053_uppernorfair:
-    %cm_toggle_bit_inverted("Bubble Mtn (To Reserve)", #$7ED8BA, #$0008, #0)
+    %cm_toggle_bit_inverted("Bubble Mtn(To Reserve)", #$7ED8BA, #$0008, #0)
 
 doors_0054_uppernorfair:
-    %cm_toggle_bit_inverted("Bubble Mtn (To Bat Cave)", #$7ED8BA, #$0010, #0)
+    %cm_toggle_bit_inverted("Bubble Mtn(To Bat Cave)", #$7ED8BA, #$0010, #0)
 
 doors_0055_uppernorfair:
     %cm_toggle_bit_inverted("Speed Booster Hall", #$7ED8BA, #$0020, #0)
@@ -2062,19 +2062,19 @@ DoorsWreckedShipOffMenu:
     %cm_header("WRECKED SHIP OFF DOORS")
 
 doors_0080_wreckedshipoff:
-    %cm_toggle_bit_inverted("Attic (To West Ocean)", #$7ED8C0, #$0001, #0)
+    %cm_toggle_bit_inverted("Attic(To West Ocean)", #$7ED8C0, #$0001, #0)
 
 doors_0081_wreckedshipoff:
-    %cm_toggle_bit_inverted("Attic (To Robot Missiles)", #$7ED8C0, #$0002, #0)
+    %cm_toggle_bit_inverted("Attic(To Robot Missile)", #$7ED8C0, #$0002, #0)
 
 doors_0082_wreckedship:
-    %cm_toggle_bit_inverted("Main Shaft (To Left Supers)", #$7ED8C0, #$0004, #0)
+    %cm_toggle_bit_inverted("Main Shaft(To L Supers)", #$7ED8C0, #$0004, #0)
 
 doors_0083_wreckedship:
-    %cm_toggle_bit_inverted("Main Shaft (To Sponge Bath)", #$7ED8C0, #$0008, #0)
+    %cm_toggle_bit_inverted("Main Shaft(To Sponge)", #$7ED8C0, #$0008, #0)
 
 doors_0084_wreckedshipoff:
-    %cm_toggle_bit_inverted("Main Shaft (To Basement)", #$7ED8C0, #$0010, #0)
+    %cm_toggle_bit_inverted("Main Shaft(To Basement)", #$7ED8C0, #$0010, #0)
 
 doors_0085_wreckedshipoff:
     %cm_toggle_bit_inverted("Phantoon Eye Door", #$7ED8C0, #$0020, #0)
@@ -2098,13 +2098,13 @@ doors_0087_wreckedshipon:
     %cm_toggle_bit_inverted("Bowling Alley", #$7ED8C0, #$0080, #0)
 
 doors_0088_wreckedshipon:
-    %cm_toggle_bit_inverted("Attic (To West Ocean)", #$7ED8C0, #$0100, #0)
+    %cm_toggle_bit_inverted("Attic(To West Ocean)", #$7ED8C0, #$0100, #0)
 
 doors_0089_wreckedshipon:
-    %cm_toggle_bit_inverted("Attic (To Robot Missiles)", #$7ED8C0, #$0200, #0)
+    %cm_toggle_bit_inverted("Attic(To Robot Missile)", #$7ED8C0, #$0200, #0)
 
 doors_008A_wreckedshipon:
-    %cm_toggle_bit_inverted("Attic (To Main Shaft)", #$7ED8C0, #$0400, #0)
+    %cm_toggle_bit_inverted("Attic(To Main Shaft)", #$7ED8C0, #$0400, #0)
 
 doors_008B_wreckedshipon:
     %cm_toggle_bit_inverted("Electric Death", #$7ED8C0, #$0800, #0)
@@ -2223,10 +2223,10 @@ doors_00A3_tourian:
     %cm_toggle_bit_inverted("Metroid Room 4", #$7ED8C4, #$0008, #0)
 
 doors_00A4_tourian:
-    %cm_toggle_bit_inverted("Dust Torizo (To Hoppers)", #$7ED8C4, #$0010, #0)
+    %cm_toggle_bit_inverted("Dust Torizo(To Hoppers)", #$7ED8C4, #$0010, #0)
 
 doors_00A5_tourian:
-    %cm_toggle_bit_inverted("Dust Torizo (To Big Boy)", #$7ED8C4, #$0020, #0)
+    %cm_toggle_bit_inverted("Dust Torizo(To Big Boy)", #$7ED8C4, #$0020, #0)
 
 doors_00A6_tourian:
     %cm_toggle_bit_inverted("Big Boy Room", #$7ED8C4, #$0040, #0)

src/layout.asm

@@ -1674,6 +1674,91 @@ hook_layout_spazer_block_plm_entry:
     dw #layout_spazer_block_plm_entry
 
 
+; Landing site top-left grey door (escape)
+org $8F8048
+hook_layout_asm_landingsite_door1_escape_plm:
+    dw #$1002
+
+; Landing site bottom-right grey door (escape)
+org $8F804E
+hook_layout_asm_landingsite_door2_escape_plm:
+    dw #$1003
+
+; Landing site top-right grey door (escape)
+org $8F8054
+hook_layout_asm_landingsite_door3_escape_plm:
+    dw #$1004
+
+; Parlor top-left grey door (escape)
+org $8F81B0
+hook_layout_asm_parlor_door0_escape_plm:
+    dw #$1006
+
+; Parlor middle-left grey door (escape)
+org $8F81B6
+hook_layout_asm_parlor_door5_escape_plm:
+    dw #$1007
+
+; Parlor bottom-left grey door (escape)
+org $8F81BC
+hook_layout_asm_parlor_door6_escape_plm:
+    dw #$1008
+
+; Parlor bottom-right grey door (escape)
+org $8F81C2
+hook_layout_asm_parlor_door2_escape_plm:
+    dw #$1009
+
+; Parlor bottom grey door (escape)
+org $8F81C8
+hook_layout_asm_parlor_door4_escape_plm:
+    dw #$100A
+
+; West Ocean grey door
+org $8F81E0
+hook_layout_asm_westocean_door5_plm:
+    dw #$100B
+
+; Climb top-right grey door
+org $8F82FC
+hook_layout_asm_climb_door1_plm:
+    dw #$1011
+
+; Climb bottom-left grey door
+org $8F8302
+hook_layout_asm_climb_door4_plm:
+    dw #$1012
+
+; Climb top-left grey door (escape)
+org $8F83A0
+hook_layout_asm_climb_door1_escape_plm:
+    dw #$1014
+
+; Climb middle-right grey door (escape)
+org $8F83A6
+hook_layout_asm_climb_door2_escape_plm:
+    dw #$1015
+
+; Climb bottom-right grey door (escape)
+org $8F83AC
+hook_layout_asm_climb_door3_escape_plm:
+    dw #$1016
+
+; Climb bottom-left grey door (escape)
+org $8F83B2
+hook_layout_asm_climb_door4_escape_plm:
+    dw #$1017
+
+; Pit Room left grey door (Zebes asleep)
+org $8F83CC
+hook_layout_asm_pitroom_door0_asleep_plm:
+    dw #$1018
+
+; Green Brinstar Main Shaft bottom-right grey door
+org $8F84D4
+hook_layout_asm_greenbrinmainshaft_door6_plm:
+    dw #$1024
+
 ; Parlor escape setup asm
 org $8F919C
 layout_parlor_escape_setup_asm:
@@ -1919,6 +2004,36 @@ hook_layout_asm_escape_explosion:
     JMP layout_asm_escape_screen_shake
 warnpc $8FC183
 
+; Bowling middle-left grey door
+org $8FC2F9
+hook_layout_asm_bowling_door1_plm:
+    dw #$1087
+
+; Dust Torizo right grey door
+org $8FC827
+hook_layout_asm_dusttorizo_door0_plm:
+    dw #$10A4
+
+; Big Boy Room right grey door
+org $8FC835
+hook_layout_asm_bigboyroom_door0_plm:
+    dw #$10A6
+
+; Tourian Escape 2 top grey door
+org $8FC893
+hook_layout_asm_tourianescape2_door0_plm:
+    dw #$10AA
+
+; Tourian Escape 3 left grey door
+org $8FC8A1
+hook_layout_asm_tourianescape3_door0_plm:
+    dw #$10AB
+
+; Tourian Escape 4 left grey door
+org $8FC8AF
+hook_layout_asm_tourianescape4_door0_plm:
+    dw #$10AC
+
 ; Tourian escape 1 setup asm
 org $8FC926
 hook_layout_asm_tourian_escape_1:

src/main.asm

@@ -17,7 +17,7 @@ lorom
 !VERSION_MAJOR = 2
 !VERSION_MINOR = 7
 !VERSION_BUILD = 2
-!VERSION_REV   = 1
+!VERSION_REV   = 2
 
 table ../resources/normal.tbl
 print ""

web/data/changelog.mdx

@@ -21,6 +21,7 @@
 - Modified ZSNES detection and ported in new splash screen (2.7.2)
 - Fix periodic damage >= 256 edge case with non-vanilla suit properties (2.7.2)
 - Fix typos in SuperHUD menu that prevented some selections from working (2.7.2.1)
+- Allow door event flags for grey doors to work (2.7.2.2)
 
 # Version 2.6.x
 - Optimize kraid rock projectiles to reduce lag when Kraid rises (2.6.0)

web/data/config.json

@@ -1,6 +1,6 @@
 {
     "name": "Super Metroid Practice Hack",
-    "version": "2.7.2.1",
+    "version": "2.7.2.2",
     "variants": ["NTSC", "PAL"],
     "base": {
         "NTSC": {