diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index ed1c9d4..ad79282 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -125,7 +125,6 @@ incsrc capacityupgrades.asm incsrc timer.asm incsrc doorframefixes.asm incsrc music.asm -incsrc hashalphabet.asm incsrc roomloading.asm incsrc icepalacegraphics.asm warnpc $A18000 @@ -168,6 +167,7 @@ incsrc boots.asm incsrc fileselect.asm incsrc playername.asm incsrc decryption.asm +incsrc hashalphabet.asm incsrc inverted.asm incsrc invertedmaps.asm incsrc newhud.asm @@ -590,6 +590,9 @@ Palette_ArmorAndGloves: org $1BEE52 Palette_Hud: +org $1BEF96 +Palette_SelectScreen: + org $1CFAAA ShopKeeper_RapidTerminateReceiveItem: diff --git a/fileselect.asm b/fileselect.asm index d06827f..8c97291 100644 --- a/fileselect.asm +++ b/fileselect.asm @@ -443,13 +443,13 @@ FileSelectItems: .quake dw #$0209|!FS_COLOR_YELLOW, #$0219|!FS_COLOR_YELLOW|!FS_HFLIP|!FS_VFLIP, #$0219|!FS_COLOR_YELLOW, #$0209|!FS_COLOR_YELLOW|!FS_HFLIP|!FS_VFLIP .lamp - dw #$022C|!FS_COLOR_RED, #$022C|!FS_COLOR_RED|!FS_HFLIP|, #$023C|!FS_COLOR_RED, #$023D|!FS_COLOR_RED + dw #$022C|!FS_COLOR_RED, #$022C|!FS_COLOR_RED|!FS_HFLIP, #$023C|!FS_COLOR_RED, #$023D|!FS_COLOR_RED .hammer dw #$0222|!FS_COLOR_BROWN, #$0223|!FS_COLOR_BROWN, #$0232|!FS_COLOR_BROWN, #$0233|!FS_COLOR_BROWN .bugnet dw #$0228|!FS_COLOR_YELLOW, #$0229|!FS_COLOR_YELLOW, #$0238|!FS_COLOR_YELLOW, #$0239|!FS_COLOR_YELLOW .shovel - dw #$0224|!FS_COLOR_YELLOW, #$0225|!FS_COLOR_YELLOW, #$0234|!FS_COLOR_YELLOW, #$0235|!FS_COLOR_YELLOW + dw #$0224|!FS_COLOR_BROWN, #$0225|!FS_COLOR_BROWN, #$0234|!FS_COLOR_BROWN, #$0235|!FS_COLOR_BROWN .flute dw #$0226|!FS_COLOR_BLUE, #$0227|!FS_COLOR_BLUE, #$0236|!FS_COLOR_BLUE, #$0237|!FS_COLOR_BLUE .book @@ -719,7 +719,20 @@ LoadFullItemTiles: RTL ;-------------------------------------------------------------------------------- -LoadPaletteCredits: +SetFileSelectPalette: + LDA $10 : CMP.b #$04 : BNE + + ; load the vanilla file select screen BG3 palette for naming screen + LDA.b #$01 : STA $0AB2 + JSL.l Palette_Hud + BRA .done + + + JSL.l LoadCustomHudPalette + .done +JML Palette_SelectScreen ; Jump to the subroutine whose call we wrote over + +;-------------------------------------------------------------------------------- + +LoadCustomHudPalette: PHA : PHX REP #$20 LDX.b #$40 diff --git a/hashalphabet.asm b/hashalphabet.asm index 4251e13..9d7b00b 100644 --- a/hashalphabet.asm +++ b/hashalphabet.asm @@ -185,23 +185,6 @@ DMAAlphabetTilemap: LDA #$01 : STA $420B ; begin DMA transfer PLA : STA $2100 ; put screen back however it was before ;-------------------------------------------------------------------------------- - LDA.b #$00 : STA $4300 ; set DMA transfer direction A -> B, bus A auto increment, single-byte mode - LDA.b #$80 : STA $4301 ; set bus B destination to WRAM register - - STZ $2181 ; set WRAM register source address - LDA.b #$C5 : STA $2182 - LDA.b #$7E : STA $2183 - - LDA.b #GFX_HUD_Palette : STA $4302 ; set bus A source address to WRAM - LDA.b #GFX_HUD_Palette>>8 : STA $4303 ; set bus A source address to WRAM - LDA.b #GFX_HUD_Palette>>16 : STA $4304 ; set bus A source bank - - LDA.b #$40 : STA $4305 : STZ $4306 ; set transfer size to 0x40 - - LDA #$01 : STA $420B ; begin DMA transfer - - INC $15 ; ensure CGRAM gets updated - ;-------------------------------------------------------------------------------- PLA : STA $4306 ; restore DMA parameters PLA : STA $4305 ; restore DMA parameters PLA : STA $4304 ; restore DMA parameters diff --git a/hooks.asm b/hooks.asm index 4496b20..28af0e8 100755 --- a/hooks.asm +++ b/hooks.asm @@ -75,6 +75,9 @@ JSL.l OnQuit ;================================================================================ ; Title Screen ;-------------------------------------------------------------------------------- +org $0CCDA5 ; <- Bank0C.asm : 1650 (JSL Palette_SelectScreen) +JSL.l SetFileSelectPalette +;-------------------------------------------------------------------------------- org $0CCE41 ; <- 64E41 - Bank0C.asm : 1907 (DEC $C8 : BPL .done) LDA $C8 : EOR.b #$04 : STA $C8 : NOP #2 ; set cursor to only select first file and erase org $0CCE50 ; <- 64E50 - Bank0C.asm : 1918 (INC $C8) diff --git a/stats/main.asm b/stats/main.asm index 8359a6a..baefc49 100755 --- a/stats/main.asm +++ b/stats/main.asm @@ -605,7 +605,7 @@ CheckFontTable: NearEnding: STZ.w $012A ; disable triforce helper thread - JSL LoadPaletteCredits + JSL LoadCustomHudPalette REP #$10 JSL AltBufferTable_credits JSR DrawEndingItems