Skip to content

Sprite features now has option to show hitboxes in blue or white color #269

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 6 commits into from
Jul 13, 2026
Merged

Sprite features now has option to show hitboxes in blue or white color #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4e43b99
Sprite features now has option to show hitboxes in blue or white color
idlechild Jul 11, 2026
20cd0f6
Add option to overwrite hitbox blue and/or grapple beam color
idlechild Jul 12, 2026
ea3a2fd
Clean up menu and apply color setting to OOB Samus hitbox
idlechild Jul 12, 2026
da04889
Fix Ceres elevator presets on PAL
idlechild Jul 13, 2026
1e035cb
Restore Ceres sprite 5 black color when riding elevator
idlechild Jul 13, 2026
a882689
Release 2.7.8
idlechild Jul 13, 2026
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
Binary file modified resources/cm_gfx.bin
View file
Open in desktop
Binary file not shown.
Binary file modified resources/cm_gfx2.bin
View file
Open in desktop
Binary file not shown.
Binary file added resources/spritegfx.pal
View file
Open in desktop
Binary file not shown.
33 changes: 20 additions & 13 deletions src/customizemenu.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ mc_dynamic_custompalettes_menu:
dw #mc_choosecustomtext

mc_custompalettes_menu:
%cm_submenu("Customize Menu Palette", #CustomPalettesMenu)
%cm_jsl("Customize Menu Palette", mc_prepare_custom_palettes_menu, #CustomPalettesMenu)

mc_choosecustomtext:
%cm_jsl("Choose CUSTOM to customize", #.routine, #$0000)
Expand Down Expand Up @@ -609,6 +609,13 @@ mc_customheader:
.done
RTL

mc_prepare_custom_palettes_menu:
TDC : STA !ram_cm_dummy_off
INC : STA !ram_cm_dummy_on
LDA #$00FF : STA !ram_cm_dummy_num
%setmenubank()
JML action_submenu

CustomPalettesMenu:
dw #custompalettes_text
dw #custompalettes_seltext
Expand All @@ -624,44 +631,44 @@ CustomPalettesMenu:
dw #$FFFF
dw #$FFFF
dw #$FFFF
dw #$FFFF
%examplemenu() ; inserts dummy menu items for display purposes
dw #$FFFF
dw #mc_custompalettes_test_menu
dw #$0000
%cm_header("CUSTOMIZE MENU PALETTE")

custompalettes_text:
%palettemenu("Text", PalettesMenu_text, !sram_palette_text)
%palettemenu("Text", PalettesMenu_text, !sram_palette_text, #$2894)

custompalettes_seltext:
%palettemenu("Selected Text", PalettesMenu_seltext, !sram_palette_seltext)
%palettemenu("Selected Text", PalettesMenu_seltext, !sram_palette_seltext, #$3894)

custompalettes_seltextbg:
%palettemenu("Selected Text Background", PalettesMenu_seltextbg, !sram_palette_seltextbg)
%palettemenu("Selected Text Background", PalettesMenu_seltextbg, !sram_palette_seltextbg, #$381F)

custompalettes_headerline:
%palettemenu("Header Outline", PalettesMenu_headerline, !sram_palette_headeroutline)
%palettemenu("Header Outline", PalettesMenu_headerline, !sram_palette_headeroutline, #$2891)

custompalettes_numfill:
%palettemenu("Number Field Text", PalettesMenu_numfill, !sram_palette_numfill)
%palettemenu("Number Field Text", PalettesMenu_numfill, !sram_palette_numfill, #$2C94)

custompalettes_numline:
%palettemenu("Number Field Outline", PalettesMenu_numline, !sram_palette_numoutline)
%palettemenu("Number Field Outline", PalettesMenu_numline, !sram_palette_numoutline, #$2C91)

custompalettes_numsel:
%palettemenu("Selected Num-Field Text", PalettesMenu_numsel, !sram_palette_numsel)
%palettemenu("Selected Num-Field Text", PalettesMenu_numsel, !sram_palette_numsel, #$3C94)

custompalettes_numselline:
%palettemenu("Selected Num-Field Outline", PalettesMenu_numselline, !sram_palette_numseloutline)
%palettemenu("Selected Num-Field Outline", PalettesMenu_numselline, !sram_palette_numseloutline, #$3C91)

custompalettes_toggleon:
%palettemenu("Toggle ON", PalettesMenu_toggleon, !sram_palette_toggleon)
%palettemenu("Toggle ON", PalettesMenu_toggleon, !sram_palette_toggleon, #$3891)

custompalettes_border:
%palettemenu("Toggle OFF + Border", PalettesMenu_border, !sram_palette_border)
%palettemenu("Toggle OFF + Border", PalettesMenu_border, !sram_palette_border, #$2491)

custompalettes_background:
%palettemenu("Background", PalettesMenu_background, !sram_palette_background)
%palettemenu("Background", PalettesMenu_background, !sram_palette_background, #$241F)

custompalettes_hex_red:
%cm_numfield_color("Hexadecimal Red", !ram_cm_custompalette_red, #MixRGB)
Expand Down
26 changes: 24 additions & 2 deletions src/defines.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,13 @@

!ram_cm_sprites_spacetime = !WRAM_MENU_START+$90
!ram_cm_sprites_xray = !WRAM_MENU_START+$92
!ram_cm_sprites_samus_hitbox = !WRAM_MENU_START+$94
!ram_cm_sprites_samus_proj = !WRAM_MENU_START+$96
!ram_cm_sprites_enemy_hitbox = !WRAM_MENU_START+$98
!ram_cm_sprites_enemy_proj = !WRAM_MENU_START+$9A
!ram_cm_sprites_palette_blue = !WRAM_MENU_START+$9C
!ram_cm_sprites_palette_green = !WRAM_MENU_START+$9E
!ram_cm_sprites_palette_red = !WRAM_MENU_START+$A0

!ram_cm_ctrl_add_shortcut_slot = !WRAM_MENU_START+$90
!ram_cm_ctrl_last_pri = !WRAM_MENU_START+$92
Expand Down Expand Up @@ -410,7 +417,7 @@
; and is reset to zero when loading a savestate

; Reserve 48 bytes for CGRAM cache
; Currently first 28 bytes plus last 2 bytes are used
; Currently first 32 bytes plus last 2 bytes are used
!ram_cgram_cache = !WRAM_MENU_START+$D0 ; $30 bytes


Expand Down Expand Up @@ -469,7 +476,7 @@
; SRAM
; -----

!SRAM_VERSION = #$001F
!SRAM_VERSION = #$0020

!SRAM_START = $702000
!SRAM_SIZE = #$1000
Expand Down Expand Up @@ -556,6 +563,8 @@
!sram_fast_teleport = !SRAM_START+$AA
!sram_update_timers_ctrl_input = !SRAM_START+$AC
!sram_update_timers_options = !SRAM_START+$AE
!sram_sprite_features_blue_color = !SRAM_START+$B0
!sram_sprite_features_grapple_color = !SRAM_START+$B2

; ^ FREE SPACE ^ up to +$CE

Expand Down Expand Up @@ -711,6 +720,9 @@
!CTRL_L = #$0020
!CTRL_R = #$0010

!VANILLA_SPRITE_PALETTE_5_BLUE_COLOR = #$7D08
!VANILLA_SPRITE_PALETTE_5_GRAPPLE_COLOR = #$7F91

!PLM_DELETE = $AAE3

!MUSIC_ROUTINE = $808FC1
Expand Down Expand Up @@ -992,6 +1004,7 @@
!SAMUS_POWER_BOMB_X = $0CE2
!SAMUS_POWER_BOMB_Y = $0CE4
!OFFSCREEN_HDMA_INDEX = $0D1E
!GRAPPLE_BEAM_FUNCTION = $0D32
!CURRENT_BLOCK_INDEX = $0DC4
!SAMUS_VERTICAL_COLLISION_RESULT = $0DC6
!SAMUS_X_SPEED_KILLED = $0DCE
Expand Down Expand Up @@ -1329,6 +1342,7 @@ endif
!ACTION_MANAGE_PRESETS = #$002A
!ACTION_CATEGORY_PRESET = #$002C
!ACTION_ADJUST_ITEM = #$002E
!ACTION_COLOR_BAR = #$0030

!SAFEWORD = #$5AFE

Expand Down Expand Up @@ -1384,6 +1398,14 @@ endif
!SPRITE_HUD_XRAY = #$0200
!SPRITE_HUD_XRAY_INVERTED = #$FDFF
!SPRITE_OOB_X_WRAP = #$0400
!SPRITE_SAMUS_HITBOX_WHITE = #$1000
!SPRITE_SAMUS_HITBOX_INVERTED = #$EFFF
!SPRITE_SAMUS_PROJ_WHITE = #$2000
!SPRITE_SAMUS_PROJ_INVERTED = #$DFFF
!SPRITE_ENEMY_HITBOX_WHITE = #$4000
!SPRITE_ENEMY_HITBOX_INVERTED = #$BFFF
!SPRITE_ENEMY_PROJ_WHITE = #$8000
!SPRITE_ENEMY_PROJ_INVERTED = #$7FFF

!UPDATE_TIMERS_CTRL_SHORTCUT_TYPE = $05

Expand Down
5 changes: 5 additions & 0 deletions src/init.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ init_sram_routine_table:
dw init_sram_upgrade_1Cto1D
dw init_sram_upgrade_1Dto1E
dw init_sram_upgrade_1Eto1F
dw init_sram_upgrade_1Fto20
dw init_sram_fail

init_sram:
Expand Down Expand Up @@ -315,6 +316,10 @@ endif
JSR init_reset_rng_control
INC : STA !sram_hard_reset_clears_rng

.upgrade_1Fto20
LDA !VANILLA_SPRITE_PALETTE_5_BLUE_COLOR : STA !sram_sprite_features_blue_color
LDA !VANILLA_SPRITE_PALETTE_5_GRAPPLE_COLOR : STA !sram_sprite_features_grapple_color

LDA !SRAM_VERSION : STA !sram_initialized
RTS

Expand Down
11 changes: 8 additions & 3 deletions src/macros.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ macro examplemenu()
dw #mc_dummy_num
endmacro

macro palettemenu(title, label, addr)
macro palettemenu(title, label, addr, color_tile)
; menu tables for customizing menu color palettes
%cm_jsl("<title>", #palettemenu_setup, <label>)

Expand All @@ -443,7 +443,7 @@ macro palettemenu(title, label, addr)
dw #$FFFF
dw <label>_hex_word
dw #$FFFF
dw #$FFFF
dw <label>_color_bar
dw #$FFFF
dw #$FFFF
dw #$FFFF
Expand All @@ -458,7 +458,12 @@ macro palettemenu(title, label, addr)
.set
STA <addr>
JML SplitRGB
}

<label>_color_bar:
.dm_actionIndex
dw !ACTION_COLOR_BAR
.dm_colorTile
dw <color_tile>
endmacro

macro setupRGB(addr)
Expand Down
4 changes: 2 additions & 2 deletions src/main.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ lorom

!VERSION_MAJOR = 2
!VERSION_MINOR = 7
!VERSION_BUILD = 7
!VERSION_REV = 1
!VERSION_BUILD = 8
!VERSION_REV = 0

table ../resources/normal.tbl
print ""
Expand Down
Loading
Loading