From 18867235fb31dc11203ccc0627db97ee8bc28c7f Mon Sep 17 00:00:00 2001
From: StalledStorm <112809386+StalledStorm@users.noreply.github.com>
Date: Tue, 20 Jan 2026 23:11:16 +0000
Subject: [PATCH 1/8] Custom Environmental Hazard Damage

---
 src/mars_patcher/mf/auto_generated_types.py   | 18 +++++++++++
 .../mf/constants/reserved_space.py            |  2 +-
 src/mars_patcher/mf/data/schema.json          | 31 +++++++++++++++++++
 src/mars_patcher/mf/misc_patches.py           | 13 ++++++++
 src/mars_patcher/mf/patcher.py                |  4 +++
 5 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/src/mars_patcher/mf/auto_generated_types.py b/src/mars_patcher/mf/auto_generated_types.py
index 523ebd3..0d3d075 100644
--- a/src/mars_patcher/mf/auto_generated_types.py
+++ b/src/mars_patcher/mf/auto_generated_types.py
@@ -513,6 +513,23 @@ class MarsschemamfCreditstextItem(typ.TypedDict, total=False):
 ]
 
 
+class MarsschemamfCustomenvironmentalhazarddamage(typ.TypedDict):
+    Lava: Typeu8 = 20
+    """The amount of damage taken while submerged in lava."""
+
+    Acid: Typeu8 = 60
+    """The amount of damage taken while submerged in acid."""
+
+    Heat: Typeu8 = 6
+    """The amount of damage taken while in a heated environment."""
+
+    Subzero: Typeu8 = 15
+    """The amount of damage taken while in a subzero environment."""
+
+    Cold: Typeu8 = 6
+    """The amount of damage taken while in a cold environment."""
+
+
 @typ.final
 class MarsschemamfLeveledits(typ.TypedDict, total=False):
     """Specifies the Room ID."""
@@ -633,6 +650,7 @@ class Marsschemamf(typ.TypedDict, total=False):
     DisableSoundEffects: bool = False
     """Disables all sound effects when true."""
 
+    CustomEnvironmentalHazardDamage: MarsschemamfCustomenvironmentalhazarddamage
     MissileLimit: Typeu8 = 3
     """Changes how many missiles can be on-screen at a time. The vanilla game has it set to 2, the randomizer changes it to 3 by default. Zero Mission uses 4."""
 
diff --git a/src/mars_patcher/mf/constants/reserved_space.py b/src/mars_patcher/mf/constants/reserved_space.py
index 7fe926d..aac2966 100644
--- a/src/mars_patcher/mf/constants/reserved_space.py
+++ b/src/mars_patcher/mf/constants/reserved_space.py
@@ -36,7 +36,7 @@ class ReservedPointersMF(IntEnum):
     STARTING_LOCATION_ADDR = auto()
     CREDITS_PARAMETERS_ADDR = auto()  # Unused. Remnant of when we didn't have looping credits music
     HINT_SECURITY_LEVELS_ADDR = auto()
-    ENVIRONMENTAL_HARZARD_DAMAGE_ADDR = auto()  # TODO: Implement this
+    ENVIRONMENTAL_HAZARD_DAMAGE_ADDR = auto()  # TODO: Implement this
     MISSILE_LIMIT_ADDR = auto()
     ROOM_NAMES_TABLE_ADDR = auto()
     REVEAL_HIDDEN_TILES_ADDR = auto()
diff --git a/src/mars_patcher/mf/data/schema.json b/src/mars_patcher/mf/data/schema.json
index 82d7582..5d46526 100644
--- a/src/mars_patcher/mf/data/schema.json
+++ b/src/mars_patcher/mf/data/schema.json
@@ -586,6 +586,37 @@
             "description": "Disables all sound effects when true.",
             "default": false
         },
+        "CustomEnvironmentalHazardDamage": {
+            "type": "object",
+            "properties": {
+                "Lava": {
+                    "$ref": "#/$defs/TypeU8",
+                    "description": "The amount of damage taken while submerged in lava.",
+                    "default": 20
+                },
+                "Acid": {
+                    "$ref": "#/$defs/TypeU8",
+                    "description": "The amount of damage taken while submerged in acid.",
+                    "default": 60
+                },
+                "Heat": {
+                    "$ref": "#/$defs/TypeU8",
+                    "description": "The amount of damage taken while in a heated environment.",
+                    "default": 6
+                },
+                "Subzero": {
+                    "$ref": "#/$defs/TypeU8",
+                    "description": "The amount of damage taken while in a subzero environment.",
+                    "default": 15
+                },
+                "Cold": {
+                    "$ref": "#/$defs/TypeU8",
+                    "description": "The amount of damage taken while in a cold environment.",
+                    "default": 6
+                }
+            },
+            "required": ["Lava", "Acid", "Heat", "Subzero", "Cold"]
+        },
         "MissileLimit": {
             "$ref": "#/$defs/TypeU8",
             "description": "Changes how many missiles can be on-screen at a time. The vanilla game has it set to 2, the randomizer changes it to 3 by default. Zero Mission uses 4.",
diff --git a/src/mars_patcher/mf/misc_patches.py b/src/mars_patcher/mf/misc_patches.py
index 5d341cd..4d6c995 100644
--- a/src/mars_patcher/mf/misc_patches.py
+++ b/src/mars_patcher/mf/misc_patches.py
@@ -85,6 +85,19 @@ def apply_alternative_health_layout(rom: Rom) -> None:
     rom.write_8(rom.read_ptr(ReservedPointersMF.USE_ALTERNATIVE_HUD_DISPLAY.value), 1)
 
 
+def apply_custom_environmental_hazard_damage(rom: Rom, edit_dict: dict) -> None:
+    baseaddress = rom.read_ptr(ReservedPointersMF.ENVIRONMENTAL_HAZARD_DAMAGE_ADDR.value)
+    damage = {
+        0: edit_dict["Lava"],  # lava
+        1: edit_dict["Acid"],  # acid
+        2: edit_dict["Heat"],  # heat
+        3: edit_dict["Subzero"],  # subzero
+        4: edit_dict["Cold"],  # cold
+    }
+    for damagetype, damageamount in damage.items():
+        rom.write_8(baseaddress + damagetype, damageamount)
+
+
 def apply_reveal_hidden_tiles(rom: Rom) -> None:
     rom.write_8(rom.read_ptr(ReservedPointersMF.REVEAL_HIDDEN_TILES_ADDR.value), 1)
 
diff --git a/src/mars_patcher/mf/patcher.py b/src/mars_patcher/mf/patcher.py
index 1a4b99e..7f637cc 100644
--- a/src/mars_patcher/mf/patcher.py
+++ b/src/mars_patcher/mf/patcher.py
@@ -18,6 +18,7 @@
     apply_accessibility_patch,
     apply_alternative_health_layout,
     apply_base_patch,
+    apply_custom_environmental_hazard_damage,
     apply_instant_unmorph_patch,
     apply_nerf_gerons,
     apply_reveal_hidden_tiles,
@@ -151,6 +152,9 @@ def patch_mf(
     if patch_data.get("DisableSoundEffects"):
         disable_sound_effects(rom)
 
+    if patch_data.get("CustomEnvironmentalHazardDamage"):
+        apply_custom_environmental_hazard_damage(rom, patch_data["CustomEnvironmentalHazardDamage"])
+
     if "MissileLimit" in patch_data:
         change_missile_limit(rom, patch_data["MissileLimit"])
 

From 02de38f81df87ad275203fb4ec77f4a3b3220425 Mon Sep 17 00:00:00 2001
From: StalledStorm <112809386+StalledStorm@users.noreply.github.com>
Date: Wed, 21 Jan 2026 02:16:17 +0000
Subject: [PATCH 2/8] Apply amendments

---
 src/mars_patcher/mf/auto_generated_types.py   |  4 ++--
 .../mf/constants/reserved_space.py            |  2 +-
 src/mars_patcher/mf/data/schema.json          |  2 +-
 src/mars_patcher/mf/misc_patches.py           | 19 ++++++++++---------
 src/mars_patcher/mf/patcher.py                |  6 +++---
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/mars_patcher/mf/auto_generated_types.py b/src/mars_patcher/mf/auto_generated_types.py
index 0d3d075..61b1ac2 100644
--- a/src/mars_patcher/mf/auto_generated_types.py
+++ b/src/mars_patcher/mf/auto_generated_types.py
@@ -513,7 +513,7 @@ class MarsschemamfCreditstextItem(typ.TypedDict, total=False):
 ]
 
 
-class MarsschemamfCustomenvironmentalhazarddamage(typ.TypedDict):
+class MarsschemamfEnvironmentaldamage(typ.TypedDict):
     Lava: Typeu8 = 20
     """The amount of damage taken while submerged in lava."""
 
@@ -650,7 +650,7 @@ class Marsschemamf(typ.TypedDict, total=False):
     DisableSoundEffects: bool = False
     """Disables all sound effects when true."""
 
-    CustomEnvironmentalHazardDamage: MarsschemamfCustomenvironmentalhazarddamage
+    EnvironmentalDamage: MarsschemamfEnvironmentaldamage
     MissileLimit: Typeu8 = 3
     """Changes how many missiles can be on-screen at a time. The vanilla game has it set to 2, the randomizer changes it to 3 by default. Zero Mission uses 4."""
 
diff --git a/src/mars_patcher/mf/constants/reserved_space.py b/src/mars_patcher/mf/constants/reserved_space.py
index aac2966..a4fab0a 100644
--- a/src/mars_patcher/mf/constants/reserved_space.py
+++ b/src/mars_patcher/mf/constants/reserved_space.py
@@ -36,7 +36,7 @@ class ReservedPointersMF(IntEnum):
     STARTING_LOCATION_ADDR = auto()
     CREDITS_PARAMETERS_ADDR = auto()  # Unused. Remnant of when we didn't have looping credits music
     HINT_SECURITY_LEVELS_ADDR = auto()
-    ENVIRONMENTAL_HAZARD_DAMAGE_ADDR = auto()  # TODO: Implement this
+    ENVIRONMENTAL_HAZARD_DAMAGE_ADDR = auto()
     MISSILE_LIMIT_ADDR = auto()
     ROOM_NAMES_TABLE_ADDR = auto()
     REVEAL_HIDDEN_TILES_ADDR = auto()
diff --git a/src/mars_patcher/mf/data/schema.json b/src/mars_patcher/mf/data/schema.json
index 5d46526..c052039 100644
--- a/src/mars_patcher/mf/data/schema.json
+++ b/src/mars_patcher/mf/data/schema.json
@@ -586,7 +586,7 @@
             "description": "Disables all sound effects when true.",
             "default": false
         },
-        "CustomEnvironmentalHazardDamage": {
+        "EnvironmentalDamage": {
             "type": "object",
             "properties": {
                 "Lava": {
diff --git a/src/mars_patcher/mf/misc_patches.py b/src/mars_patcher/mf/misc_patches.py
index 4d6c995..0d02503 100644
--- a/src/mars_patcher/mf/misc_patches.py
+++ b/src/mars_patcher/mf/misc_patches.py
@@ -1,4 +1,5 @@
 import mars_patcher.constants.game_data as gd
+from mars_patcher.mf.auto_generated_types import MarsschemamfEnvironmentaldamage
 from mars_patcher.mf.constants.reserved_space import ReservedPointersMF
 from mars_patcher.mf.data import get_data_path
 from mars_patcher.patching import BpsDecoder, IpsDecoder
@@ -85,17 +86,17 @@ def apply_alternative_health_layout(rom: Rom) -> None:
     rom.write_8(rom.read_ptr(ReservedPointersMF.USE_ALTERNATIVE_HUD_DISPLAY.value), 1)
 
 
-def apply_custom_environmental_hazard_damage(rom: Rom, edit_dict: dict) -> None:
-    baseaddress = rom.read_ptr(ReservedPointersMF.ENVIRONMENTAL_HAZARD_DAMAGE_ADDR.value)
+def apply_environmental_damage(rom: Rom, damage_dict: MarsschemamfEnvironmentaldamage) -> None:
+    base_address = rom.read_ptr(ReservedPointersMF.ENVIRONMENTAL_HAZARD_DAMAGE_ADDR.value)
     damage = {
-        0: edit_dict["Lava"],  # lava
-        1: edit_dict["Acid"],  # acid
-        2: edit_dict["Heat"],  # heat
-        3: edit_dict["Subzero"],  # subzero
-        4: edit_dict["Cold"],  # cold
+        0: damage_dict["Lava"],
+        1: damage_dict["Acid"],
+        2: damage_dict["Heat"],
+        3: damage_dict["Subzero"],
+        4: damage_dict["Cold"],
     }
-    for damagetype, damageamount in damage.items():
-        rom.write_8(baseaddress + damagetype, damageamount)
+    for offset, damage_amount in enumerate(damage):
+        rom.write_8(base_address + offset, damage_amount)
 
 
 def apply_reveal_hidden_tiles(rom: Rom) -> None:
diff --git a/src/mars_patcher/mf/patcher.py b/src/mars_patcher/mf/patcher.py
index 7f637cc..d94b183 100644
--- a/src/mars_patcher/mf/patcher.py
+++ b/src/mars_patcher/mf/patcher.py
@@ -18,7 +18,7 @@
     apply_accessibility_patch,
     apply_alternative_health_layout,
     apply_base_patch,
-    apply_custom_environmental_hazard_damage,
+    apply_environmental_damage,
     apply_instant_unmorph_patch,
     apply_nerf_gerons,
     apply_reveal_hidden_tiles,
@@ -152,8 +152,8 @@ def patch_mf(
     if patch_data.get("DisableSoundEffects"):
         disable_sound_effects(rom)
 
-    if patch_data.get("CustomEnvironmentalHazardDamage"):
-        apply_custom_environmental_hazard_damage(rom, patch_data["CustomEnvironmentalHazardDamage"])
+    if environmental_damage := patch_data.get("EnvironmentalDamage", {}):
+        apply_environmental_damage(rom, environmental_damage)
 
     if "MissileLimit" in patch_data:
         change_missile_limit(rom, patch_data["MissileLimit"])

From 152be6fd3919f396d52447d4218b8ea50de50796 Mon Sep 17 00:00:00 2001
From: StalledStorm <112809386+StalledStorm@users.noreply.github.com>
Date: Wed, 21 Jan 2026 02:26:05 +0000
Subject: [PATCH 3/8] Make amendment

---
 src/mars_patcher/mf/misc_patches.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/mars_patcher/mf/misc_patches.py b/src/mars_patcher/mf/misc_patches.py
index 0d02503..b09220a 100644
--- a/src/mars_patcher/mf/misc_patches.py
+++ b/src/mars_patcher/mf/misc_patches.py
@@ -88,13 +88,13 @@ def apply_alternative_health_layout(rom: Rom) -> None:
 
 def apply_environmental_damage(rom: Rom, damage_dict: MarsschemamfEnvironmentaldamage) -> None:
     base_address = rom.read_ptr(ReservedPointersMF.ENVIRONMENTAL_HAZARD_DAMAGE_ADDR.value)
-    damage = {
-        0: damage_dict["Lava"],
-        1: damage_dict["Acid"],
-        2: damage_dict["Heat"],
-        3: damage_dict["Subzero"],
-        4: damage_dict["Cold"],
-    }
+    damage = [
+        damage_dict["Lava"],
+        damage_dict["Acid"],
+        damage_dict["Heat"],
+        damage_dict["Subzero"],
+        damage_dict["Cold"],
+    ]
     for offset, damage_amount in enumerate(damage):
         rom.write_8(base_address + offset, damage_amount)
 

From 5bceafa2712629747a181e2fedb3ab40c09842db Mon Sep 17 00:00:00 2001
From: StalledStorm <112809386+StalledStorm@users.noreply.github.com>
Date: Thu, 22 Jan 2026 21:04:28 +0000
Subject: [PATCH 4/8] Update patcher.py

---
 src/mars_patcher/mf/patcher.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mars_patcher/mf/patcher.py b/src/mars_patcher/mf/patcher.py
index d94b183..0c4b674 100644
--- a/src/mars_patcher/mf/patcher.py
+++ b/src/mars_patcher/mf/patcher.py
@@ -152,7 +152,7 @@ def patch_mf(
     if patch_data.get("DisableSoundEffects"):
         disable_sound_effects(rom)
 
-    if environmental_damage := patch_data.get("EnvironmentalDamage", {}):
+    if environmental_damage := patch_data.get("EnvironmentalDamage"):
         apply_environmental_damage(rom, environmental_damage)
 
     if "MissileLimit" in patch_data:

From e7708d64ed4b1b6d5d7a907ebc2402845b12009c Mon Sep 17 00:00:00 2001
From: StalledStorm <112809386+StalledStorm@users.noreply.github.com>
Date: Tue, 27 Jan 2026 07:08:23 +0000
Subject: [PATCH 5/8] Swap Cold and Subzero

---
 src/mars_patcher/mf/auto_generated_types.py |  6 +++---
 src/mars_patcher/mf/data/schema.json        | 12 ++++++------
 src/mars_patcher/mf/misc_patches.py         |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/mars_patcher/mf/auto_generated_types.py b/src/mars_patcher/mf/auto_generated_types.py
index 61b1ac2..ec2bf05 100644
--- a/src/mars_patcher/mf/auto_generated_types.py
+++ b/src/mars_patcher/mf/auto_generated_types.py
@@ -523,12 +523,12 @@ class MarsschemamfEnvironmentaldamage(typ.TypedDict):
     Heat: Typeu8 = 6
     """The amount of damage taken while in a heated environment."""
 
-    Subzero: Typeu8 = 15
-    """The amount of damage taken while in a subzero environment."""
-
     Cold: Typeu8 = 6
     """The amount of damage taken while in a cold environment."""
 
+    Subzero: Typeu8 = 15
+    """The amount of damage taken while in a subzero environment. Currently unused, will always use Cold."""
+
 
 @typ.final
 class MarsschemamfLeveledits(typ.TypedDict, total=False):
diff --git a/src/mars_patcher/mf/data/schema.json b/src/mars_patcher/mf/data/schema.json
index c052039..88f476a 100644
--- a/src/mars_patcher/mf/data/schema.json
+++ b/src/mars_patcher/mf/data/schema.json
@@ -604,18 +604,18 @@
                     "description": "The amount of damage taken while in a heated environment.",
                     "default": 6
                 },
-                "Subzero": {
-                    "$ref": "#/$defs/TypeU8",
-                    "description": "The amount of damage taken while in a subzero environment.",
-                    "default": 15
-                },
                 "Cold": {
                     "$ref": "#/$defs/TypeU8",
                     "description": "The amount of damage taken while in a cold environment.",
                     "default": 6
+                },
+                "Subzero": {
+                    "$ref": "#/$defs/TypeU8",
+                    "description": "The amount of damage taken while in a subzero environment. Currently unused, will always use Cold.",
+                    "default": 15
                 }
             },
-            "required": ["Lava", "Acid", "Heat", "Subzero", "Cold"]
+            "required": ["Lava", "Acid", "Heat", "Cold", "Subzero"]
         },
         "MissileLimit": {
             "$ref": "#/$defs/TypeU8",
diff --git a/src/mars_patcher/mf/misc_patches.py b/src/mars_patcher/mf/misc_patches.py
index b09220a..d4a1c8f 100644
--- a/src/mars_patcher/mf/misc_patches.py
+++ b/src/mars_patcher/mf/misc_patches.py
@@ -92,8 +92,8 @@ def apply_environmental_damage(rom: Rom, damage_dict: MarsschemamfEnvironmentald
         damage_dict["Lava"],
         damage_dict["Acid"],
         damage_dict["Heat"],
-        damage_dict["Subzero"],
-        damage_dict["Cold"],
+        damage_dict["Cold"],  # ASM currently has Subzero and Cold mislabelled.
+        damage_dict["Subzero"],  # ASM currently has Subzero and Cold mislabelled.
     ]
     for offset, damage_amount in enumerate(damage):
         rom.write_8(base_address + offset, damage_amount)

From 89d7e8b4b55e304fe31087179bae7fbfbe0afca2 Mon Sep 17 00:00:00 2001
From: StalledStorm <112809386+StalledStorm@users.noreply.github.com>
Date: Tue, 27 Jan 2026 07:12:19 +0000
Subject: [PATCH 6/8] Amend Subzero to specifically refer to SZC

---
 src/mars_patcher/mf/auto_generated_types.py | 2 +-
 src/mars_patcher/mf/data/schema.json        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mars_patcher/mf/auto_generated_types.py b/src/mars_patcher/mf/auto_generated_types.py
index ec2bf05..f182c43 100644
--- a/src/mars_patcher/mf/auto_generated_types.py
+++ b/src/mars_patcher/mf/auto_generated_types.py
@@ -527,7 +527,7 @@ class MarsschemamfEnvironmentaldamage(typ.TypedDict):
     """The amount of damage taken while in a cold environment."""
 
     Subzero: Typeu8 = 15
-    """The amount of damage taken while in a subzero environment. Currently unused, will always use Cold."""
+    """The amount of damage taken while in Sub-Zero Containment. Currently unused, will always use Cold."""
 
 
 @typ.final
diff --git a/src/mars_patcher/mf/data/schema.json b/src/mars_patcher/mf/data/schema.json
index 88f476a..900805e 100644
--- a/src/mars_patcher/mf/data/schema.json
+++ b/src/mars_patcher/mf/data/schema.json
@@ -611,7 +611,7 @@
                 },
                 "Subzero": {
                     "$ref": "#/$defs/TypeU8",
-                    "description": "The amount of damage taken while in a subzero environment. Currently unused, will always use Cold.",
+                    "description": "The amount of damage taken while in Sub-Zero Containment. Currently unused, will always use Cold.",
                     "default": 15
                 }
             },

From 4e5e6e51d73dfc61646ec49b43ac8abbef65f104 Mon Sep 17 00:00:00 2001
From: StalledStorm <112809386+StalledStorm@users.noreply.github.com>
Date: Tue, 27 Jan 2026 08:10:24 +0000
Subject: [PATCH 7/8] Update misc_patches.py

---
 src/mars_patcher/mf/misc_patches.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mars_patcher/mf/misc_patches.py b/src/mars_patcher/mf/misc_patches.py
index d4a1c8f..06be285 100644
--- a/src/mars_patcher/mf/misc_patches.py
+++ b/src/mars_patcher/mf/misc_patches.py
@@ -93,7 +93,7 @@ def apply_environmental_damage(rom: Rom, damage_dict: MarsschemamfEnvironmentald
         damage_dict["Acid"],
         damage_dict["Heat"],
         damage_dict["Cold"],  # ASM currently has Subzero and Cold mislabelled.
-        damage_dict["Subzero"],  # ASM currently has Subzero and Cold mislabelled.
+        damage_dict["Subzero"],
     ]
     for offset, damage_amount in enumerate(damage):
         rom.write_8(base_address + offset, damage_amount)

From 263a2b85899ecc854ba2a08fdfc4fe12e6e8b144 Mon Sep 17 00:00:00 2001
From: StalledStorm <112809386+StalledStorm@users.noreply.github.com>
Date: Tue, 27 Jan 2026 18:52:32 +0000
Subject: [PATCH 8/8] Change damage to damage per second, include issue link in
 comment

---
 src/mars_patcher/mf/auto_generated_types.py | 10 +++++-----
 src/mars_patcher/mf/data/schema.json        | 10 +++++-----
 src/mars_patcher/mf/misc_patches.py         |  3 ++-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/mars_patcher/mf/auto_generated_types.py b/src/mars_patcher/mf/auto_generated_types.py
index f182c43..dffca76 100644
--- a/src/mars_patcher/mf/auto_generated_types.py
+++ b/src/mars_patcher/mf/auto_generated_types.py
@@ -515,19 +515,19 @@ class MarsschemamfCreditstextItem(typ.TypedDict, total=False):
 
 class MarsschemamfEnvironmentaldamage(typ.TypedDict):
     Lava: Typeu8 = 20
-    """The amount of damage taken while submerged in lava."""
+    """The amount of damage per second taken while submerged in lava."""
 
     Acid: Typeu8 = 60
-    """The amount of damage taken while submerged in acid."""
+    """The amount of damage per second taken while submerged in acid."""
 
     Heat: Typeu8 = 6
-    """The amount of damage taken while in a heated environment."""
+    """The amount of damage per second taken while in a heated environment."""
 
     Cold: Typeu8 = 6
-    """The amount of damage taken while in a cold environment."""
+    """The amount of damage per second taken while in a cold environment."""
 
     Subzero: Typeu8 = 15
-    """The amount of damage taken while in Sub-Zero Containment. Currently unused, will always use Cold."""
+    """The amount of damage per second taken while in Sub-Zero Containment. Currently unused, will always use Cold."""
 
 
 @typ.final
diff --git a/src/mars_patcher/mf/data/schema.json b/src/mars_patcher/mf/data/schema.json
index 900805e..8a27163 100644
--- a/src/mars_patcher/mf/data/schema.json
+++ b/src/mars_patcher/mf/data/schema.json
@@ -591,27 +591,27 @@
             "properties": {
                 "Lava": {
                     "$ref": "#/$defs/TypeU8",
-                    "description": "The amount of damage taken while submerged in lava.",
+                    "description": "The amount of damage per second taken while submerged in lava.",
                     "default": 20
                 },
                 "Acid": {
                     "$ref": "#/$defs/TypeU8",
-                    "description": "The amount of damage taken while submerged in acid.",
+                    "description": "The amount of damage per second taken while submerged in acid.",
                     "default": 60
                 },
                 "Heat": {
                     "$ref": "#/$defs/TypeU8",
-                    "description": "The amount of damage taken while in a heated environment.",
+                    "description": "The amount of damage per second taken while in a heated environment.",
                     "default": 6
                 },
                 "Cold": {
                     "$ref": "#/$defs/TypeU8",
-                    "description": "The amount of damage taken while in a cold environment.",
+                    "description": "The amount of damage per second taken while in a cold environment.",
                     "default": 6
                 },
                 "Subzero": {
                     "$ref": "#/$defs/TypeU8",
-                    "description": "The amount of damage taken while in Sub-Zero Containment. Currently unused, will always use Cold.",
+                    "description": "The amount of damage per second taken while in Sub-Zero Containment. Currently unused, will always use Cold.",
                     "default": 15
                 }
             },
diff --git a/src/mars_patcher/mf/misc_patches.py b/src/mars_patcher/mf/misc_patches.py
index 06be285..0201caf 100644
--- a/src/mars_patcher/mf/misc_patches.py
+++ b/src/mars_patcher/mf/misc_patches.py
@@ -92,7 +92,8 @@ def apply_environmental_damage(rom: Rom, damage_dict: MarsschemamfEnvironmentald
         damage_dict["Lava"],
         damage_dict["Acid"],
         damage_dict["Heat"],
-        damage_dict["Cold"],  # ASM currently has Subzero and Cold mislabelled.
+        # ASM currently has Subzero and Cold mislabelled. https://github.com/MetroidAdvRandomizerSystem/mars-fusion-asm/issues/374
+        damage_dict["Cold"],
         damage_dict["Subzero"],
     ]
     for offset, damage_amount in enumerate(damage):