thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-11-17 18:42:29 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

SGB Palette improvements and fixes!

Browse source 
- Spaceworld-ish SGB morning palettes
- Flash caves work now
- Menu Account displays without bugged colors
- Also small Mt. Ember tweaks and a collision fix
This commit is contained in:
Zeta_Null 2024-08-01 01:09:22 -04:00
parent 31cdcc488d
commit e2b7782861
5 changed files with 43 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/tilesets/sevii_collision.asm
View file

@ -77,7 +77,7 @@
tilecoll WATER, WATER, WATER, WATER ; 4c tilecoll WATER, WATER, WATER, WATER ; 4c
tilecoll WATER, WATER, WATER, WATER ; 4d tilecoll WATER, WATER, WATER, WATER ; 4d
tilecoll WALL, WALL, FLOOR, WALL ; 4e tilecoll WALL, WALL, FLOOR, WALL ; 4e
tilecoll WALL, WALL, FLOOR, WALL ; 4f tilecoll WALL, WALL, WALL, FLOOR ; 4f
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 50 tilecoll FLOOR, FLOOR, FLOOR, WALL ; 50
tilecoll FLOOR, FLOOR, WALL, WALL ; 51 tilecoll FLOOR, FLOOR, WALL, WALL ; 51
tilecoll WALL, WALL, FLOOR, FLOOR ; 52 tilecoll WALL, WALL, FLOOR, FLOOR ; 52

34
engine/gfx/cgb_layouts.asm
View file

@ -570,12 +570,17 @@ _CGB_MapPals:
ret ret
.LoadHLBGPaletteIntoDE: .LoadHLBGPaletteIntoDE:
; morn/day: shades 0, 1, 2, 3 -> 0, 1, 2, 3 ; morn: shades 0, 1, 2, 3 -> 0, 1, 2, 3
; day: shades 0, 1, 2, 3 -> 0, 2, 2, 3
; nite: shades 0, 1, 2, 3 -> 1, 2, 2, 3 ; nite: shades 0, 1, 2, 3 -> 1, 2, 2, 3
; darkness: shades 0, 1, 2, 3 -> 1, 3, 3, 3
push hl push hl
ld a, [wTimeOfDayPal] ld a, [wTimeOfDayPal]
cp NITE_F cp NITE_F
jr c, .bg_morn_day jr c, .bg_morn_day
ld a, [wTimeOfDayPal]
cp DARKNESS_F
jr nc, .bg_darkness
inc hl inc hl
inc hl inc hl
call .LoadHLColorIntoDE call .LoadHLColorIntoDE
@ -588,7 +593,34 @@ _CGB_MapPals:
pop hl pop hl
ret ret
.bg_darkness
inc hl
inc hl
call .LoadHLColorIntoDE
inc hl
inc hl
call .LoadHLColorIntoDE
dec hl
dec hl
call .LoadHLColorIntoDE
dec hl
dec hl
call .LoadHLColorIntoDE
jr .bg_done
.bg_morn_day .bg_morn_day
ld a, [wTimeOfDayPal]
cp MORN_F
jr nz, .bg_day
call .LoadHLColorIntoDE
inc hl
inc hl
call .LoadHLColorIntoDE
dec hl
dec hl
call .LoadHLColorIntoDE
call .LoadHLColorIntoDE
jr .bg_done
.bg_day
call LoadHLPaletteIntoDE call LoadHLPaletteIntoDE
jr .bg_done jr .bg_done

12
engine/menus/start_menu.asm
View file

@ -363,15 +363,15 @@ endr
jp ._DrawMenuAccount jp ._DrawMenuAccount
.PrintMenuAccount: .PrintMenuAccount:
call .IsMenuAccountOn ; call .IsMenuAccountOn
ret z ; ret z
call ._DrawMenuAccount call ._DrawMenuAccount
decoord 0, 14 decoord 0, 14
jp .MenuDesc jp .MenuDesc
._DrawMenuAccount: ._DrawMenuAccount:
call .IsMenuAccountOn ; call .IsMenuAccountOn
ret z ; ret z
hlcoord 0, 13 hlcoord 0, 13
lb bc, 5, 10 lb bc, 5, 10
call ClearBox call ClearBox
@ -380,10 +380,10 @@ endr
ld c, 8 ld c, 8
jp TextboxPalette jp TextboxPalette
.IsMenuAccountOn: ;.IsMenuAccountOn:
; ld a, [wOptions2] ; ld a, [wOptions2]
; and 1 << MENU_ACCOUNT ; and 1 << MENU_ACCOUNT
ret ; ret
.DrawBugContestStatusBox: .DrawBugContestStatusBox:
ld hl, wStatusFlags2 ld hl, wStatusFlags2

1
maps/DebugRoom.asm
View file

@ -181,6 +181,7 @@ DebugItemScript:
giveitem HM_CUT, 1 giveitem HM_CUT, 1
giveitem HM_FLY, 1 giveitem HM_FLY, 1
giveitem HM_SURF, 1 giveitem HM_SURF, 1
giveitem HM_FLASH, 1
giveitem HM_STRENGTH, 1 giveitem HM_STRENGTH, 1
giveitem HM_WHIRLPOOL, 1 giveitem HM_WHIRLPOOL, 1
giveitem HM_WATERFALL, 1 giveitem HM_WATERFALL, 1

2
maps/MtEmberExterior.ablk
View file

@ -1 +1 @@
@D@@@ki   @D=A@@ki @HQF@=A=h  =AD=A@i   A@HF@fjjjQQjjFi   LA@=AD@HQQjjjQQUg  80@=A@D@APQI 89@@@D=fQjjjQQI  LM9@@@HF^6676  89@@@D\ecccc ^_ 89@@=ADHQQQQgXY  89=A=A@DUA6Y  830@@@D fjjjj`]  89@@f\W[72789=A@HQQQF6X27 LM9@@67HQWhh 89@fW[76667ORRR? (89(@X666\[66667D  89(@\`a6\``ecccdU 89(=Ab666\[7Y7Z] 89(@\``[\W]Z](830(=AX777Y(89(((OORRNjjjjORRNNLM30OOONNOORNNN89ODDRNEPjjFDOEEE89DODEEEDDDENN89DDOPIEN((ODHFNEE8 @D@@@ki   @D=A@@ki   @HQF@=A=h =AD=A@i  A@HF@fjjjQQjjFi   LA@=AD@HQQjjjQQUg  80@=A@D@APQI 89@@@D=fQjjjQQI  LM9@@@HF^6676  89@@@D\ecccc ^_ 89@@=ADHQQQQgXY  89=A=A@DUA6Y  830@@@D fjjjj`]  89@@f\W[72789=A@HQQQF6X27 LM9@@67HQWhh 89@fW[76667ORRR? (89(@X666\[66667D  89(@\`a6\``ecccdU 89(=Ab666\[7Y7Z] 89(@\``[\W]Z](830(=AX777Y(89(((OORRNjjjjORRNNLM30OOONNOORNNN89ODDRNEPjjFDOEEE89DODEEEDDDENN89DDOPIEN((ODHFNEE8