Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
0fc8df4
Infinite-doppler mode for Phantoon.
NobodyNada Oct 4, 2022
084b512
Fix Phantoon's swoop behavior in pacifist mode
NobodyNada Jan 16, 2025
e5c9c1d
Document infi-doppler
NobodyNada Jan 16, 2025
81486f2
Implement cout's freespace macros
InsaneFirebat Feb 7, 2025
78147d5
Update NTSC-to-PAL resources based on disassembly
idlechild Feb 3, 2025
04797da
Updated resources to differentiate NSO from Virtual Console
idlechild Feb 8, 2025
706ab59
Rename rng.asm to enemy_rng.asm
idlechild Feb 22, 2025
82583a9
Port arm pump counter infohud mode
idlechild Feb 23, 2025
469be1c
Port ceres ridley hits room strat
idlechild Feb 23, 2025
6e6d82f
Port pit room right door room strat
idlechild Feb 23, 2025
dc4719c
Port kihunter manip room strat
idlechild Feb 23, 2025
73944ba
Port kraid radar room strat
idlechild Feb 23, 2025
c292072
Port zeb skip room strat
idlechild Feb 23, 2025
23cf0e4
Port custom HUD number graphics
idlechild Feb 24, 2025
92a60a5
Port Super HUD
idlechild Feb 24, 2025
a879999
Merge branch 'freespace-macro' of github.com:InsaneFirebat/sm_practic…
idlechild Feb 25, 2025
2bbec99
ten years
idlechild Feb 25, 2025
5979fa6
Port BRB menu
idlechild Feb 25, 2025
5de856c
Merge branch 'infidoppler' of github.com:NobodyNada/sm_practice_hack
idlechild Feb 26, 2025
afc281e
A few small improvements and update TODO.txt
idlechild Feb 26, 2025
bf32475
Make it easier to find minimap and top-left HUD mode options
idlechild Feb 26, 2025
4e75b74
Add option to control turret rng
idlechild Feb 26, 2025
f404851
Fix HDMA corner case
idlechild Feb 26, 2025
ed011fc
Added single reroll option to turret rng
idlechild Feb 26, 2025
1e34244
Release 2.6.6
idlechild Feb 26, 2025
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
30 changes: 17 additions & 13 deletions TODO.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,31 @@ Porting features from IFB CustomROMBase branch
For other TODO items, recommend using the github issue system
================================================================

Last branch revision ported:
30374fe1838d69f6b85f14489f48a18a84d524a6
09/07/2024: Patches for v2.6.2.4

================================================================
Features that have not been ported yet
================================================================

- BRB menu
- Capture Cropping

- Count Boss Damage

- Demo Timer

- Factory Reset option

- Custom HUD modes (except Draygon AI already ported)
- Force Stand shortcut

- IFB hijacks
- Infinite Ammo

- IFB menu
- No Steam Collision option

- Most features that use Custom Features WRAM
- Phantoon always visible

- Overwrite HUD numbers
- Randomize on load

- Super HUD
- Randomize RNG shortcut

- Reveal Boss Damage shortcut

================================================================
Features intentionally not ported
Expand All @@ -43,6 +47,8 @@ and there isn't much benefit in porting or backporting them

- Various sound effect macros

- Walk Through Walls option

- Leading > or arrow on menu items, or menuing differences in general

- AREA_ID stored in custom presets
Expand All @@ -53,8 +59,6 @@ and there isn't much benefit in porting or backporting them

- Differences in preset file names or organization

- More controller shortcuts (I think we already have too many)

- The separate ih_update_timers routine (too much duplication with ih_update_hud_code)

- Tiny states fast flag (that was removed from main branch)
Expand Down
5 changes: 2 additions & 3 deletions enemies/create_clear_enemies_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@
last_enemy_id = None
for enemy_id in sorted(enemies):
if not last_enemy_id:
f_output.write("\n\norg $E5F000\n")
f_output.write("print pc, \" clearenemies start\"\n")
f_output.write("\n\n%startfree(E5)\n")
f_output.write("ClearEnemiesTable:\n\n")
enemy_id_pal = enemy_id + 8
f_output.write("")
Expand All @@ -43,6 +42,6 @@
f_output.write("dw $000" + enemies[enemy_id] + "\n\n")
last_enemy_id = enemy_id

f_output.write("print pc, \" clearenemies end\"\n\n")
f_output.write("%endfree(E5)\n\n")
f_output.close()

5 changes: 5 additions & 0 deletions layout/create_layout.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@
key2 = key + "2"
if key2 in menus:
has_page2 = True
if door_prefix != "areaboss":
f_menu_output.write(" dw #$FFFF\n")
f_menu_output.write(" dw #doormenu_%s%s_goto_page2\n" % (goto_prefix, door_prefix))
has_page3 = False
key3 = key + "3"
Expand All @@ -191,6 +193,8 @@
f_menu_output.write(" dw #doormenu_%s %s\n" % (f'{door_menu_label:14}', data[2]))
else:
f_menu_output.write(" dw #doormenu_%s\n" % door_menu_label)
if door_prefix != "areaboss":
f_menu_output.write(" dw #$FFFF\n")
f_menu_output.write(" dw #doormenu_%s%s_goto_page1\n" % (goto_prefix, door_prefix))
if has_page3:
f_menu_output.write(" dw #doormenu_%s%s_goto_page3\n" % (goto_prefix, door_prefix))
Expand All @@ -203,6 +207,7 @@
f_menu_output.write(" dw #doormenu_%s %s\n" % (f'{door_menu_label:14}', data[2]))
else:
f_menu_output.write(" dw #doormenu_%s\n" % door_menu_label)
f_menu_output.write(" dw #$FFFF\n")
f_menu_output.write(" dw #doormenu_%s%s_goto_page1\n" % (goto_prefix, door_prefix))
f_menu_output.write(" dw #doormenu_%s%s_goto_page2\n" % (goto_prefix, door_prefix))
f_menu_output.write(" dw #$0000\n")
Expand Down
7 changes: 3 additions & 4 deletions layout/layoutmenutemplate.asm
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

pushpc
org $E48000
print pc, " layoutmenu start"
%startfree(E4)

; -------------------------
; Room Layout menu
Expand Down Expand Up @@ -321,6 +320,7 @@ layout_bombtorizodoor:
db #$28, "r VANILLA", #$FF
db #$28, "r FAST", #$FF
db #$28, "r SLOW", #$FF
db #$FF

layout_magnetstairs:
%cm_toggle_bit("Remove Magnet Stairs", !sram_room_layout, !ROOM_LAYOUT_MAGNET_STAIRS, #0)
Expand Down Expand Up @@ -869,6 +869,5 @@ layout_updown_downdoor:
portals_down_vanilla_table:


print pc, " layoutmenu end"
warnpc $E4E000 ; customizemenu.asm
%endfree(E4)
pullpc
5 changes: 2 additions & 3 deletions names/create_names.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@
f_output.write("\n; Room Names")
f_output.write("\n; (autogenerated)")
f_output.write("\n; ---------------")
f_output.write("\n\norg $E58000\n")
f_output.write("print pc, \" roomnames start\"\n")
f_output.write("\n\n%startfree(E5)\n")
f_output.write("RoomNameTextTable:\n")
f_output.write("ROOM:\n\n")

Expand All @@ -72,6 +71,6 @@
last_room_end = int(last_room_id, 16) + max_characters
f_output.write("warnpc $E5" + f'{last_room_end:04X}' + "\n\n")

f_output.write("print pc, \" roomnames end\"\n\n")
f_output.write("%endfree(E5)\n\n")
f_output.close()

Binary file added resources/cm_brb_gfx.bin
Binary file not shown.
Loading