Skip to content

Cleanup preset data and fix Kraid Kihunters presets #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
idlechild merged 1 commit into from
Aug 20, 2026
Merged

Cleanup preset data and fix Kraid Kihunters presets #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/presets/100map_data.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4497,7 +4497,6 @@ preset_100map_greenpink_brin_cleanup_green_hill_zone_final:
dw $09C2, $006B ; Health
dw $09C6, $0008 ; Missiles
dw $09CA, $000B ; Supers
dw $09CE, $0003 ; Pbs
dw $0A1C, $0001 ; Samus position/state
dw $0A1E, $0008 ; More position/state
dw $0AF6, $035E ; Samus X
Expand Down Expand Up @@ -4538,7 +4537,6 @@ preset_100map_blue_brinstar_cleanup_blue_brinstar_etank_room:
dw $0919, $0000 ; Layer 2 Y position
dw $09C2, $0069 ; Health
dw $09C6, $0003 ; Missiles
dw $09CE, $0003 ; Pbs
dw $09D2, $0000 ; Currently selected item
dw $0AF6, $00D8 ; Samus X
dw $CAE8, $0460 ; Map counter
Expand Down Expand Up @@ -4970,7 +4968,6 @@ preset_100map_tourian_baby_skip:
dw $0911, $0100 ; Screen X position in pixels
dw $0913, $1000 ; Screen subpixel Y position
dw $0917, $00C0 ; Layer 2 X position
dw $09C2, $031F ; Health
dw $09CA, $000D ; Supers
dw $0A1C, $0002 ; Samus position/state
dw $0A1E, $0004 ; More position/state
Expand Down
2 changes: 0 additions & 2 deletions src/presets/14ice_data.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,9 +374,7 @@ preset_14ice_brinstar_big_pink:
dw $090F, $7000 ; Screen subpixel X position
dw $0911, $0600 ; Screen X position in pixels
dw $0913, $9400 ; Screen subpixel Y position
dw $0915, $0000 ; Screen Y position in pixels
dw $0917, $0480 ; Layer 2 X position
dw $0919, $0000 ; Layer 2 Y position
dw $09C6, $0000 ; Missiles
dw $09CA, $0004 ; Supers
dw $09CC, $0005 ; Max supers
Expand Down
2 changes: 0 additions & 2 deletions src/presets/14speed_data.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,9 +374,7 @@ preset_14speed_brinstar_big_pink:
dw $090F, $7000 ; Screen subpixel X position
dw $0911, $0600 ; Screen X position in pixels
dw $0913, $9400 ; Screen subpixel Y position
dw $0915, $0000 ; Screen Y position in pixels
dw $0917, $0480 ; Layer 2 X position
dw $0919, $0000 ; Layer 2 Y position
dw $09C6, $0000 ; Missiles
dw $09CA, $0004 ; Supers
dw $09CC, $0005 ; Max supers
Expand Down
6 changes: 3 additions & 3 deletions src/presets/combined_preset_data.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4704,7 +4704,7 @@ preset_kpdr22_kraid_kraid_kihunters:
dw $079B, $A471 ; MDB
dw $0913, $8000 ; Screen subpixel Y position
dw $0919, $0100 ; Layer 2 Y position
dw $09D2, $0002 ; Currently selected item
dw $09CA, $0002 ; Supers
dw $0AF6, $0167 ; Samus X
dw $0AF8, $B000 ; Samus subpixel X
dw #$FFFF
Expand Down Expand Up @@ -5450,7 +5450,7 @@ preset_kpdr25_kraid_kraid_kihunters:
dw $09A6, $1004 ; Equipped Beams
dw $09A8, $1004 ; Collected Beams
dw $09C6, $0007 ; Missiles
dw $09CA, $0004 ; Supers
dw $09CA, $0003 ; Supers
dw $D874, $0404 ; Items
dw $D8B6, $8008 ; Doors
dw #$FFFF
Expand Down Expand Up @@ -6284,7 +6284,7 @@ preset_kpdr25_kraid_minikraid:
dw $09A6, $1004 ; Equipped Beams
dw $09A8, $1004 ; Collected Beams
dw $09C6, $0007 ; Missiles
dw $09CA, $0004 ; Supers
dw $09CA, $0003 ; Supers
dw $D874, $0404 ; Items
dw $D8B6, $8008 ; Doors
dw #$FFFF
Expand Down
17 changes: 3 additions & 14 deletions src/presets/kpdr20_data.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,10 +491,8 @@ preset_kpdr20_brinstar_passing_through_maridia:
dw $078D, $9132 ; DDB
dw $079B, $A408 ; MDB
dw $090F, $8000 ; Screen subpixel X position
dw $0911, $0100 ; Screen X position in pixels
dw $0913, $CC00 ; Screen subpixel Y position
dw $0915, $0100 ; Screen Y position in pixels
dw $0917, $00C0 ; Layer 2 X position
dw $0919, $00C0 ; Layer 2 Y position
dw $09C6, $0006 ; Missiles
dw $09CA, $0005 ; Supers
Expand All @@ -512,7 +510,6 @@ preset_kpdr20_kraid_entering_kraids_lair:
dw $0919, $0100 ; Layer 2 Y position
dw $09D2, $0002 ; Currently selected item
dw $0AF6, $002E ; Samus X
dw $0AFA, $018B ; Samus Y
dw #$FFFF

preset_kpdr20_kraid_warehouse_zeelas:
Expand All @@ -534,13 +531,14 @@ preset_kpdr20_kraid_warehouse_zeelas:
dw #$FFFF

preset_kpdr20_kraid_kraid_kihunters:
dw #preset_kpdr20_kraid_entering_kraids_lair ; Kraid: Entering Kraid's Lair
dw #preset_kpdr20_kraid_warehouse_zeelas ; Kraid: Warehouse Zeelas
dw $078D, $923A ; DDB
dw $079B, $A471 ; MDB
dw $07F5, $0005 ; Music Track
dw $090F, $8000 ; Screen subpixel X position
dw $0911, $0100 ; Screen X position in pixels
dw $0913, $8000 ; Screen subpixel Y position
dw $0915, $0100 ; Screen Y position in pixels
dw $0917, $00C0 ; Layer 2 X position
dw $0919, $0100 ; Layer 2 Y position
dw $0AF6, $0167 ; Samus X
Expand Down Expand Up @@ -642,14 +640,10 @@ preset_kpdr20_kraid_minikraid_revisit:
dw $079B, $A56B ; MDB
dw $090F, $3000 ; Screen subpixel X position
dw $0913, $7800 ; Screen subpixel Y position
dw $0915, $0100 ; Screen Y position in pixels
dw $0919, $0100 ; Layer 2 Y position
dw $09C2, $007C ; Health
dw $09D2, $0002 ; Currently selected item
dw $0A1C, $0002 ; Samus position/state
dw $0A1E, $0004 ; More position/state
dw $0AF6, $0058 ; Samus X
dw $0AFA, $018B ; Samus Y
dw #$FFFF

preset_kpdr20_kraid_kraid_kihunters_revisit:
Expand Down Expand Up @@ -691,13 +685,11 @@ preset_kpdr20_kraid_business_center_preelev:
dw $090F, $3000 ; Screen subpixel X position
dw $0911, $0006 ; Screen X position in pixels
dw $0913, $0000 ; Screen subpixel Y position
dw $0917, $0006 ; Layer 2 X position
dw $0915, $0000 ; Screen Y position in pixels
dw $0917, $0006 ; Layer 2 X position
dw $0919, $0000 ; Layer 2 Y position
dw $09C6, $0006 ; Missiles
dw $09CA, $0004 ; Supers
dw $0A1C, $0002 ; Samus position/state
dw $0A1E, $0004 ; More position/state
dw $0AF6, $0078 ; Samus X
dw $0AFA, $008B ; Samus Y
dw #$FFFF
Expand Down Expand Up @@ -866,7 +858,6 @@ preset_kpdr20_upper_norfair_bat_cave_revisit:
dw $0919, $0014 ; Layer 2 Y position
dw $09A2, $3105 ; Equipped Items
dw $09A4, $3105 ; Collected Items
dw $09CA, $0001 ; Supers
dw $0A1C, $0002 ; Samus position/state
dw $0A1E, $0004 ; More position/state
dw $0AF6, $002D ; Samus X
Expand All @@ -881,7 +872,6 @@ preset_kpdr20_upper_norfair_single_chamber:
dw $079B, $ACB3 ; MDB
dw $090F, $BFFF ; Screen subpixel X position
dw $0911, $0100 ; Screen X position in pixels
dw $0913, $0000 ; Screen subpixel Y position
dw $0915, $0104 ; Screen Y position in pixels
dw $0917, $00C0 ; Layer 2 X position
dw $0919, $00C3 ; Layer 2 Y position
Expand Down Expand Up @@ -1769,7 +1759,6 @@ preset_kpdr20_upper_norfair_revisit_ice_beam_gates:
dw $078D, $9246 ; DDB
dw $079B, $A7DE ; MDB
dw $07F3, $0015 ; Music Bank
dw $090F, $8000 ; Screen subpixel X position
dw $0913, $0000 ; Screen subpixel Y position
dw $0915, $0238 ; Screen Y position in pixels
dw $0919, $01AA ; Layer 2 Y position
Expand Down
17 changes: 3 additions & 14 deletions src/presets/kpdr21_data.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,10 +491,8 @@ preset_kpdr21_brinstar_passing_through_maridia:
dw $078D, $9132 ; DDB
dw $079B, $A408 ; MDB
dw $090F, $8000 ; Screen subpixel X position
dw $0911, $0100 ; Screen X position in pixels
dw $0913, $CC00 ; Screen subpixel Y position
dw $0915, $0100 ; Screen Y position in pixels
dw $0917, $00C0 ; Layer 2 X position
dw $0919, $00C0 ; Layer 2 Y position
dw $09C6, $0006 ; Missiles
dw $09CA, $0005 ; Supers
Expand All @@ -512,7 +510,6 @@ preset_kpdr21_kraid_entering_kraids_lair:
dw $0919, $0100 ; Layer 2 Y position
dw $09D2, $0002 ; Currently selected item
dw $0AF6, $002E ; Samus X
dw $0AFA, $018B ; Samus Y
dw #$FFFF

preset_kpdr21_kraid_warehouse_zeelas:
Expand All @@ -534,13 +531,14 @@ preset_kpdr21_kraid_warehouse_zeelas:
dw #$FFFF

preset_kpdr21_kraid_kraid_kihunters:
dw #preset_kpdr21_kraid_entering_kraids_lair ; Kraid: Entering Kraid's Lair
dw #preset_kpdr21_kraid_warehouse_zeelas ; Kraid: Warehouse Zeelas
dw $078D, $923A ; DDB
dw $079B, $A471 ; MDB
dw $07F5, $0005 ; Music Track
dw $090F, $8000 ; Screen subpixel X position
dw $0911, $0100 ; Screen X position in pixels
dw $0913, $8000 ; Screen subpixel Y position
dw $0915, $0100 ; Screen Y position in pixels
dw $0917, $00C0 ; Layer 2 X position
dw $0919, $0100 ; Layer 2 Y position
dw $0AF6, $0167 ; Samus X
Expand Down Expand Up @@ -642,14 +640,10 @@ preset_kpdr21_kraid_minikraid_revisit:
dw $079B, $A56B ; MDB
dw $090F, $3000 ; Screen subpixel X position
dw $0913, $7800 ; Screen subpixel Y position
dw $0915, $0100 ; Screen Y position in pixels
dw $0919, $0100 ; Layer 2 Y position
dw $09C2, $007C ; Health
dw $09D2, $0002 ; Currently selected item
dw $0A1C, $0002 ; Samus position/state
dw $0A1E, $0004 ; More position/state
dw $0AF6, $0058 ; Samus X
dw $0AFA, $018B ; Samus Y
dw #$FFFF

preset_kpdr21_kraid_kraid_kihunters_revisit:
Expand Down Expand Up @@ -691,13 +685,11 @@ preset_kpdr21_kraid_business_center_preelev:
dw $090F, $3000 ; Screen subpixel X position
dw $0911, $0006 ; Screen X position in pixels
dw $0913, $0000 ; Screen subpixel Y position
dw $0917, $0006 ; Layer 2 X position
dw $0915, $0000 ; Screen Y position in pixels
dw $0917, $0006 ; Layer 2 X position
dw $0919, $0000 ; Layer 2 Y position
dw $09C6, $0006 ; Missiles
dw $09CA, $0004 ; Supers
dw $0A1C, $0002 ; Samus position/state
dw $0A1E, $0004 ; More position/state
dw $0AF6, $0078 ; Samus X
dw $0AFA, $008B ; Samus Y
dw #$FFFF
Expand Down Expand Up @@ -866,7 +858,6 @@ preset_kpdr21_upper_norfair_bat_cave_revisit:
dw $0919, $0014 ; Layer 2 Y position
dw $09A2, $3105 ; Equipped Items
dw $09A4, $3105 ; Collected Items
dw $09CA, $0001 ; Supers
dw $0A1C, $0002 ; Samus position/state
dw $0A1E, $0004 ; More position/state
dw $0AF6, $002D ; Samus X
Expand All @@ -881,7 +872,6 @@ preset_kpdr21_upper_norfair_single_chamber:
dw $079B, $ACB3 ; MDB
dw $090F, $BFFF ; Screen subpixel X position
dw $0911, $0100 ; Screen X position in pixels
dw $0913, $0000 ; Screen subpixel Y position
dw $0915, $0104 ; Screen Y position in pixels
dw $0917, $00C0 ; Layer 2 X position
dw $0919, $00C3 ; Layer 2 Y position
Expand Down Expand Up @@ -1771,7 +1761,6 @@ preset_kpdr21_upper_norfair_revisit_ice_beam_gates:
dw $078D, $9246 ; DDB
dw $079B, $A7DE ; MDB
dw $07F3, $0015 ; Music Bank
dw $090F, $8000 ; Screen subpixel X position
dw $0913, $0000 ; Screen subpixel Y position
dw $0915, $0238 ; Screen Y position in pixels
dw $0919, $01AA ; Layer 2 Y position
Expand Down
17 changes: 2 additions & 15 deletions src/presets/kpdr22_data.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,10 +491,8 @@ preset_kpdr22_brinstar_passing_through_maridia:
dw $078D, $9132 ; DDB
dw $079B, $A408 ; MDB
dw $090F, $8000 ; Screen subpixel X position
dw $0911, $0100 ; Screen X position in pixels
dw $0913, $CC00 ; Screen subpixel Y position
dw $0915, $0100 ; Screen Y position in pixels
dw $0917, $00C0 ; Layer 2 X position
dw $0919, $00C0 ; Layer 2 Y position
dw $09C6, $0006 ; Missiles
dw $09CA, $0005 ; Supers
Expand All @@ -512,7 +510,6 @@ preset_kpdr22_kraid_entering_kraids_lair:
dw $0919, $0100 ; Layer 2 Y position
dw $09D2, $0002 ; Currently selected item
dw $0AF6, $002E ; Samus X
dw $0AFA, $018B ; Samus Y
dw #$FFFF

preset_kpdr22_kraid_warehouse_zeelas:
Expand All @@ -534,13 +531,14 @@ preset_kpdr22_kraid_warehouse_zeelas:
dw #$FFFF

preset_kpdr22_kraid_kraid_kihunters:
dw #preset_kpdr22_kraid_entering_kraids_lair ; Kraid: Entering Kraid's Lair
dw #preset_kpdr22_kraid_warehouse_zeelas ; Kraid: Warehouse Zeelas
dw $078D, $923A ; DDB
dw $079B, $A471 ; MDB
dw $07F5, $0005 ; Music Track
dw $090F, $8000 ; Screen subpixel X position
dw $0911, $0100 ; Screen X position in pixels
dw $0913, $8000 ; Screen subpixel Y position
dw $0915, $0100 ; Screen Y position in pixels
dw $0917, $00C0 ; Layer 2 X position
dw $0919, $0100 ; Layer 2 Y position
dw $0AF6, $0167 ; Samus X
Expand Down Expand Up @@ -642,14 +640,10 @@ preset_kpdr22_kraid_minikraid_revisit:
dw $079B, $A56B ; MDB
dw $090F, $3000 ; Screen subpixel X position
dw $0913, $7800 ; Screen subpixel Y position
dw $0915, $0100 ; Screen Y position in pixels
dw $0919, $0100 ; Layer 2 Y position
dw $09C2, $007C ; Health
dw $09D2, $0002 ; Currently selected item
dw $0A1C, $0002 ; Samus position/state
dw $0A1E, $0004 ; More position/state
dw $0AF6, $0058 ; Samus X
dw $0AFA, $018B ; Samus Y
dw #$FFFF

preset_kpdr22_kraid_kraid_kihunters_revisit:
Expand Down Expand Up @@ -711,8 +705,6 @@ preset_kpdr22_kraid_business_center_preelev:
dw $0911, $0006 ; Screen X position in pixels
dw $0913, $0000 ; Screen subpixel Y position
dw $0917, $0006 ; Layer 2 X position
dw $0915, $0000 ; Screen Y position in pixels
dw $0919, $0000 ; Layer 2 Y position
dw $09C6, $0006 ; Missiles
dw $09CA, $0004 ; Supers
dw $0A1C, $0002 ; Samus position/state
Expand Down Expand Up @@ -885,7 +877,6 @@ preset_kpdr22_upper_norfair_hjb_missile_bat_cave_revisit:
dw $0919, $0014 ; Layer 2 Y position
dw $09A2, $3105 ; Equipped Items
dw $09A4, $3105 ; Collected Items
dw $09CA, $0001 ; Supers
dw $0A1C, $0002 ; Samus position/state
dw $0A1E, $0004 ; More position/state
dw $0AF6, $002D ; Samus X
Expand All @@ -900,7 +891,6 @@ preset_kpdr22_upper_norfair_hjb_missile_single_chamber:
dw $079B, $ACB3 ; MDB
dw $090F, $BFFF ; Screen subpixel X position
dw $0911, $0100 ; Screen X position in pixels
dw $0913, $0000 ; Screen subpixel Y position
dw $0915, $0104 ; Screen Y position in pixels
dw $0917, $00C0 ; Layer 2 X position
dw $0919, $00C3 ; Layer 2 Y position
Expand Down Expand Up @@ -1155,7 +1145,6 @@ preset_kpdr22_upper_norfair_moat_missile_bat_cave_revisit:
dw $0919, $0014 ; Layer 2 Y position
dw $09A2, $3105 ; Equipped Items
dw $09A4, $3105 ; Collected Items
dw $09CA, $0001 ; Supers
dw $0A1C, $0002 ; Samus position/state
dw $0A1E, $0004 ; More position/state
dw $0AF6, $002D ; Samus X
Expand All @@ -1170,7 +1159,6 @@ preset_kpdr22_upper_norfair_moat_missile_single_chamber:
dw $079B, $ACB3 ; MDB
dw $090F, $BFFF ; Screen subpixel X position
dw $0911, $0100 ; Screen X position in pixels
dw $0913, $0000 ; Screen subpixel Y position
dw $0915, $0104 ; Screen Y position in pixels
dw $0917, $00C0 ; Layer 2 X position
dw $0919, $00C3 ; Layer 2 Y position
Expand Down Expand Up @@ -2240,7 +2228,6 @@ preset_kpdr22_upper_norfair_revisit_ice_beam_gates:
dw $078D, $9246 ; DDB
dw $079B, $A7DE ; MDB
dw $07F3, $0015 ; Music Bank
dw $090F, $8000 ; Screen subpixel X position
dw $0913, $0000 ; Screen subpixel Y position
dw $0915, $0238 ; Screen Y position in pixels
dw $0919, $01AA ; Layer 2 Y position
Expand Down
Loading
Loading