diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index bdccf50..7fd6fef 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -184,6 +184,7 @@ incsrc multiworld.asm incsrc textrenderer.asm incsrc crystalswitchbook.asm incsrc mimicdash.asm +incsrc gloom.asm warnpc $A58000 org $A28000 diff --git a/data/c2e3e.bin b/data/c2e3e.bin index af6aeba..f6b100c 100644 Binary files a/data/c2e3e.bin and b/data/c2e3e.bin differ diff --git a/data/c2e3e.gfx b/data/c2e3e.gfx index fc8e82f..a894e26 100644 Binary files a/data/c2e3e.gfx and b/data/c2e3e.gfx differ diff --git a/data/skull.bin b/data/skull.bin new file mode 100644 index 0000000..721c919 Binary files /dev/null and b/data/skull.bin differ diff --git a/gloom.asm b/gloom.asm new file mode 100644 index 0000000..ddde197 --- /dev/null +++ b/gloom.asm @@ -0,0 +1,38 @@ +AdjustDefaultGraphics: + JSL $80E310 + + LDA.l ChallengeModes : AND.b #$03 : CMP.b #$02 : BEQ .gloom + RTL + +.gloom + LDA.b #$80 + STA.w $2115 + LDA.b #$00 + STA.w $2116 + LDA.b #$75 + STA.w $2117 + + LDA.b #$01 + STA.w $4300 + LDA.b #$18 + STA.w $4301 + + LDA.b #SkullGfx + STA.w $4302 + LDA.b #SkullGfx>>8 + STA.w $4303 + LDA.b #SkullGfx>>16 + STA.w $4304 + + LDA.b #SkullGfx_end-SkullGfx + STA.w $4305 + LDA.b #(SkullGfx_end-SkullGfx)>>8 + STA.w $4306 + + LDA.b #$01 + STA.w $420B + RTL + +SkullGfx: + incbin "data/skull.bin" +.end diff --git a/hooks.asm b/hooks.asm index 81f0895..ee03ac1 100755 --- a/hooks.asm +++ b/hooks.asm @@ -2722,3 +2722,14 @@ LDA.b #$30 ;-------------------------------------------------------------------------------- org $9EC7BE JSL MimicDirection + +;=================================================================================================== +;-------------------------------------------------------------------------------- +; Gloom VRAM overwrite +;-------------------------------------------------------------------------------- +org $828068 +JSL AdjustDefaultGraphics +org $8CC229 +JSL AdjustDefaultGraphics +org $8CCCC0 +JSL AdjustDefaultGraphics diff --git a/newhud.asm b/newhud.asm index 34d2a5d..18be445 100644 --- a/newhud.asm +++ b/newhud.asm @@ -509,7 +509,7 @@ UpdateHearts: LDA.l HUDHeartColors_index : ASL : TAX LDA.l HUDHeartColors_masks_game_hud,X PLX - ORA.l HeartIcon + ORA.w #$20A0 CPY.b #$01 BPL .add_heart @@ -553,14 +553,14 @@ UpdateHearts: LDA.l HUDHeartColors_index : ASL : TAX LDA.l HUDHeartColors_masks_game_hud,X - ORA.l HalfHeartIcon + ORA.w #$20A1 STA.b (Scrap09) BRA .skip_partial .more_than_half LDA.l HUDHeartColors_index : ASL : TAX LDA.l HUDHeartColors_masks_game_hud,X - ORA.l HeartIcon + ORA.w #$20A0 STA.b (Scrap09) .skip_partial @@ -580,7 +580,7 @@ CheckHeartPalette: PHX LDA.l HUDHeartColors_index : ASL : TAX LDA.l HUDHeartColors_masks_game_hud,X - ORA.l HeartIcon + ORA.w #$20A0 PLX RTS diff --git a/tables.asm b/tables.asm index 139bc13..07d6ae6 100644 --- a/tables.asm +++ b/tables.asm @@ -2644,14 +2644,8 @@ org $B0F032 ; PC 0x187032 RomSpeed: db $01 ; $01 = FastROM (default) | $00 = SlowROM -org $B0F033 ; PC 0x187033 -HeartIcon: -dw $20A0 -HalfHeartIcon: -dw $20A1 - ;-------------------------------------------------------------------------------- -; 0x187037 - 18703F (unused) +; 0x187033 - 18703F (unused) ;-------------------------------------------------------------------------------- org $B0F040 ; PC 0x187040