morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

More address and bit adjustments

Browse Source
This commit is contained in:
MarioSpore
2025-08-08 20:16:31 -04:00
parent 59e4a6c1e3
commit 8ba0bbc73a
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
worlds/grinch/Items.py
View File

@@ -61,11 +61,11 @@ GADGETS_TABLE: dict[str, GrinchItemData] = {
GrinchRamData(0x0102CD, value=0x48), GrinchRamData(0x0102CE, value=0x49), GrinchRamData(0x0102CD, value=0x48), GrinchRamData(0x0102CE, value=0x49),
GrinchRamData(0x0102CF, value=0x4A), GrinchRamData(0x0100BC, binary_bit_pos=3)]), GrinchRamData(0x0102CF, value=0x4A), GrinchRamData(0x0100BC, binary_bit_pos=3)]),
"Octopus Climbing Device": GrinchItemData("Gadgets", 104, IC.progression, "Octopus Climbing Device": GrinchItemData("Gadgets", 104, IC.progression,
[GrinchRamData(0x0102D0, value=0x40), GrinchRamData(0x0102DA, value=0x41), [GrinchRamData(0x0102D0, value=0x40), GrinchRamData(0x0102D1, value=0x41),
GrinchRamData(0x0102DB, value=0x42), GrinchRamData(0x0102DC, value=0x44), GrinchRamData(0x0102D2, value=0x42), GrinchRamData(0x0102D3, value=0x44),
GrinchRamData(0x0102DD, value=0x45), GrinchRamData(0x0102DE, value=0x46), GrinchRamData(0x0102D4, value=0x45), GrinchRamData(0x0102D5, value=0x46),
GrinchRamData(0x0102DF, value=0x48), GrinchRamData(0x0102E0, value=0x49), GrinchRamData(0x0102D6, value=0x48), GrinchRamData(0x0102D7, value=0x49),
GrinchRamData(0x0102E1, value=0x4A), GrinchRamData(0x0100BC, binary_bit_pos=4)]), GrinchRamData(0x0102D8, value=0x4A), GrinchRamData(0x0100BC, binary_bit_pos=4)]),
"Marine Mobile": GrinchItemData("Gadgets", 105, IC.progression, "Marine Mobile": GrinchItemData("Gadgets", 105, IC.progression,
[GrinchRamData(0x0102D9, value=0x40), GrinchRamData(0x0102DA, value=0x41), [GrinchRamData(0x0102D9, value=0x40), GrinchRamData(0x0102DA, value=0x41),
GrinchRamData(0x0102DB, value=0x42), GrinchRamData(0x0102DC, value=0x43), GrinchRamData(0x0102DB, value=0x42), GrinchRamData(0x0102DC, value=0x43),

4
worlds/grinch/Locations.py
View File

@@ -139,8 +139,8 @@ grinch_locations = {
#Grinch Copter Blueprints #Grinch Copter Blueprints
"GC Blueprint - Whoville City Hall - Safe Room": GrinchLocationData("City Hall", "Grinch Copter Blueprints", 1200, [GrinchRamData(0x01021F, binary_bit_pos=7)]), "GC Blueprint - Whoville City Hall - Safe Room": GrinchLocationData("City Hall", "Grinch Copter Blueprints", 1200, [GrinchRamData(0x01021F, binary_bit_pos=7)]),
"GC Blueprint - Whoville City Hall - Statue Room": GrinchLocationData("City Hall", "Grinch Copter Blueprints", 1201, [GrinchRamData(0x010220, binary_bit_pos=0)]), "GC Blueprint - Whoville City Hall - Statue Room": GrinchLocationData("City Hall", "Grinch Copter Blueprints", 1201, [GrinchRamData(0x010220, binary_bit_pos=0)]),
"GC Blueprint - Whoville Clock Tower - Before Bells": GrinchLocationData("Countdown to X-Mas Clock Tower", "Grinch Copter Blueprints", 1202, [GrinchRamData(0x010265, binary_bit_pos=3)]), "GC Blueprint - Whoville Clock Tower - Before Bells": GrinchLocationData("Countdown to X-Mas Clock Tower", "Grinch Copter Blueprints", 1202, [GrinchRamData(0x010216, binary_bit_pos=3)]),
"GC Blueprint - Whoville Clock Tower - After Bells": GrinchLocationData("Countdown to X-Mas Clock Tower", "Grinch Copter Blueprints", 1203, [GrinchRamData(0x010265, binary_bit_pos=2)]), "GC Blueprint - Whoville Clock Tower - After Bells": GrinchLocationData("Countdown to X-Mas Clock Tower", "Grinch Copter Blueprints", 1203, [GrinchRamData(0x010216, binary_bit_pos=2)]),
"GC Blueprint - Who Forest Ski Resort - Inside Dog's Fence": GrinchLocationData("Ski Resort", "Grinch Copter Blueprints", 1204, [GrinchRamData(0x010234, binary_bit_pos=7)]), "GC Blueprint - Who Forest Ski Resort - Inside Dog's Fence": GrinchLocationData("Ski Resort", "Grinch Copter Blueprints", 1204, [GrinchRamData(0x010234, binary_bit_pos=7)]),
"GC Blueprint - Who Forest Ski Resort - Max Cave": GrinchLocationData("Ski Resort", "Grinch Copter Blueprints", 1205, [GrinchRamData(0x010234, binary_bit_pos=6)]), "GC Blueprint - Who Forest Ski Resort - Max Cave": GrinchLocationData("Ski Resort", "Grinch Copter Blueprints", 1205, [GrinchRamData(0x010234, binary_bit_pos=6)]),
"GC Blueprint - Who Forest Civic Center - Climb across Bat Cave wall": GrinchLocationData("Civic Center", "Grinch Copter Blueprints", 1206, [GrinchRamData(0x01022A, binary_bit_pos=7)]), "GC Blueprint - Who Forest Civic Center - Climb across Bat Cave wall": GrinchLocationData("Civic Center", "Grinch Copter Blueprints", 1206, [GrinchRamData(0x01022A, binary_bit_pos=7)]),