Merge 'Fix Starting Health in SaveContext' (#2515)

Author: fenhl

CHANGELOG.md

@@ -7,6 +7,7 @@
 ## Bug fixes
 * Fix a potential softlock when talking to Pierre (the upper scarecrow) as child in Lake Hylia.
 * Fix a generator failure when a dungeon reward is selected as a random starting item.
+* Fix a bug where the starting health capacity in game might be miscalculated when starting with a heart piece.
 
 # 9.0
 

SaveContext.py

@@ -288,7 +288,7 @@ def give_health(self, health: float):
 
         self.addresses['health_capacity'].value       = int(health) * 0x10
         self.addresses['health'].value                = int(health) * 0x10
-        self.addresses['quest']['heart_pieces'].value = int((health % 1) * 4) * 0x10
+        self.addresses['quest']['heart_pieces'].value = int((health % 1) * 4)
 
     def give_item(self, world: World, item: str, count: int = 1) -> None:
         if item.endswith(')'):
@@ -689,7 +689,7 @@ def get_save_context_addresses() -> AddressesDict:
                 'stone_of_agony'         : Address(0x00A4, mask=0x00200000),
                 'gerudos_card'           : Address(0x00A4, mask=0x00400000),
                 'gold_skulltula'         : Address(0x00A4, mask=0x00800000),
-                'heart_pieces'           : Address(0x00A4, mask=0xFF000000),
+                'heart_pieces'           : Address(0x00A4, mask=0xF0000000),
             },
 
             # Dungeon Items

version.py

@@ -1,4 +1,4 @@
-__version__ = '9.0.7'
+__version__ = '9.0.8'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0