alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Fix color of line of naming screen

Browse Source
This commit is contained in:
Kevin Cathcart
2018-09-25 20:57:38 -04:00
parent 4c3dcb55e4
commit cf869bd69c
5 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
LTTP_RND_GeneralBugfixes.asm
View File

@@ -125,7 +125,6 @@ incsrc capacityupgrades.asm
incsrc timer.asm incsrc timer.asm
incsrc doorframefixes.asm incsrc doorframefixes.asm
incsrc music.asm incsrc music.asm
incsrc hashalphabet.asm
incsrc roomloading.asm incsrc roomloading.asm
incsrc icepalacegraphics.asm incsrc icepalacegraphics.asm
warnpc $A18000 warnpc $A18000
@@ -168,6 +167,7 @@ incsrc boots.asm
incsrc fileselect.asm incsrc fileselect.asm
incsrc playername.asm incsrc playername.asm
incsrc decryption.asm incsrc decryption.asm
incsrc hashalphabet.asm
incsrc inverted.asm incsrc inverted.asm
incsrc invertedmaps.asm incsrc invertedmaps.asm
incsrc newhud.asm incsrc newhud.asm
@@ -590,6 +590,9 @@ Palette_ArmorAndGloves:
org $1BEE52 org $1BEE52
Palette_Hud: Palette_Hud:
org $1BEF96
Palette_SelectScreen:
org $1CFAAA org $1CFAAA
ShopKeeper_RapidTerminateReceiveItem: ShopKeeper_RapidTerminateReceiveItem:

19
fileselect.asm
View File

@@ -443,13 +443,13 @@ FileSelectItems:
.quake .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 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 .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 .hammer
dw #$0222|!FS_COLOR_BROWN, #$0223|!FS_COLOR_BROWN, #$0232|!FS_COLOR_BROWN, #$0233|!FS_COLOR_BROWN dw #$0222|!FS_COLOR_BROWN, #$0223|!FS_COLOR_BROWN, #$0232|!FS_COLOR_BROWN, #$0233|!FS_COLOR_BROWN
.bugnet .bugnet
dw #$0228|!FS_COLOR_YELLOW, #$0229|!FS_COLOR_YELLOW, #$0238|!FS_COLOR_YELLOW, #$0239|!FS_COLOR_YELLOW dw #$0228|!FS_COLOR_YELLOW, #$0229|!FS_COLOR_YELLOW, #$0238|!FS_COLOR_YELLOW, #$0239|!FS_COLOR_YELLOW
.shovel .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 .flute
dw #$0226|!FS_COLOR_BLUE, #$0227|!FS_COLOR_BLUE, #$0236|!FS_COLOR_BLUE, #$0237|!FS_COLOR_BLUE dw #$0226|!FS_COLOR_BLUE, #$0227|!FS_COLOR_BLUE, #$0236|!FS_COLOR_BLUE, #$0237|!FS_COLOR_BLUE
.book .book
@@ -719,7 +719,20 @@ LoadFullItemTiles:
RTL 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 PHA : PHX
REP #$20 REP #$20
LDX.b #$40 LDX.b #$40

17
hashalphabet.asm
View File

@@ -185,23 +185,6 @@ DMAAlphabetTilemap:
LDA #$01 : STA $420B ; begin DMA transfer LDA #$01 : STA $420B ; begin DMA transfer
PLA : STA $2100 ; put screen back however it was before 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 $4306 ; restore DMA parameters
PLA : STA $4305 ; restore DMA parameters PLA : STA $4305 ; restore DMA parameters
PLA : STA $4304 ; restore DMA parameters PLA : STA $4304 ; restore DMA parameters

3
hooks.asm
View File

@@ -75,6 +75,9 @@ JSL.l OnQuit
;================================================================================ ;================================================================================
; Title Screen ; Title Screen
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $0CCDA5 ; <- Bank0C.asm : 1650 (JSL Palette_SelectScreen)
JSL.l SetFileSelectPalette
;--------------------------------------------------------------------------------
org $0CCE41 ; <- 64E41 - Bank0C.asm : 1907 (DEC $C8 : BPL .done) 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 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) org $0CCE50 ; <- 64E50 - Bank0C.asm : 1918 (INC $C8)

2
stats/main.asm
View File

@@ -605,7 +605,7 @@ CheckFontTable:
NearEnding: NearEnding:
STZ.w $012A ; disable triforce helper thread STZ.w $012A ; disable triforce helper thread
JSL LoadPaletteCredits JSL LoadCustomHudPalette
REP #$10 REP #$10
JSL AltBufferTable_credits JSL AltBufferTable_credits
JSR DrawEndingItems JSR DrawEndingItems