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

Reposition pendant/crystals and add heart piece count

Browse Source
This commit is contained in:
Kevin Cathcart
2018-09-17 21:50:43 -04:00
parent bde5f3d73f
commit bcd1397df6
1 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
fileselect.asm
View File

@@ -309,6 +309,11 @@ DrawPlayerFile:
%fs_drawItem(9,26,FileSelectItems_heart_piece_3_of_4) %fs_drawItem(9,26,FileSelectItems_heart_piece_3_of_4)
++ ++
LDA $700448
JSL.l HexToDec
LDA $7F5006 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(11,26)
LDA $7F5007 : AND.w #$00FF : !ADD.w #$210+!FS_COLOR_BW : %fs_draw8x8(11,27)
; Boots ; Boots
%fs_drawItemBasic($700355,3,28,FileSelectItems_boots) %fs_drawItemBasic($700355,3,28,FileSelectItems_boots)
@@ -331,24 +336,24 @@ DrawPlayerFile:
; Pendants ; Pendants
LDA $700374 : AND.w #$0004 : BEQ + LDA $700374 : AND.w #$0004 : BEQ +
%fs_drawItem(12,16,FileSelectItems_green_pendant) %fs_drawItem(12,12,FileSelectItems_green_pendant)
BRA ++ BRA ++
+ +
%fs_drawItemGray(12,16,FileSelectItems_green_pendant) %fs_drawItem(12,12,FileSelectItems_no_pendant)
++ ++
LDA $700374 : AND.w #$0002 : BEQ + LDA $700374 : AND.w #$0002 : BEQ +
%fs_drawItem(12,18,FileSelectItems_blue_pendant) %fs_drawItem(12,14,FileSelectItems_blue_pendant)
BRA ++ BRA ++
+ +
%fs_drawItemGray(12,18,FileSelectItems_blue_pendant) %fs_drawItem(12,14,FileSelectItems_no_pendant)
++ ++
LDA $700374 : AND.w #$0001 : BEQ + LDA $700374 : AND.w #$0001 : BEQ +
%fs_drawItem(12,20,FileSelectItems_red_pendant) %fs_drawItem(12,16,FileSelectItems_red_pendant)
BRA ++ BRA ++
+ +
%fs_drawItemGray(12,20,FileSelectItems_red_pendant) %fs_drawItem(12,16,FileSelectItems_no_pendant)
++ ++
; Crystals ; Crystals
@@ -357,49 +362,49 @@ DrawPlayerFile:
BRA ++ BRA ++
+ +
LDA.w #$0287|!FS_COLOR_GRAY LDA.w #$0287|!FS_COLOR_GRAY
++ : %fs_draw16x8(13,22) ++ : %fs_draw16x8(13,18)
LDA $70037A : AND.w #$0010 : BEQ + LDA $70037A : AND.w #$0010 : BEQ +
LDA.w #$0297|!FS_COLOR_BLUE LDA.w #$0297|!FS_COLOR_BLUE
BRA ++ BRA ++
+ +
LDA.w #$0287|!FS_COLOR_GRAY LDA.w #$0287|!FS_COLOR_GRAY
++ : %fs_draw16x8(12,23) ++ : %fs_draw16x8(12,19)
LDA $70037A : AND.w #$0040 : BEQ + LDA $70037A : AND.w #$0040 : BEQ +
LDA.w #$0297|!FS_COLOR_BLUE LDA.w #$0297|!FS_COLOR_BLUE
BRA ++ BRA ++
+ +
LDA.w #$0287|!FS_COLOR_GRAY LDA.w #$0287|!FS_COLOR_GRAY
++ : %fs_draw16x8(13,24) ++ : %fs_draw16x8(13,20)
LDA $70037A : AND.w #$0020 : BEQ + LDA $70037A : AND.w #$0020 : BEQ +
LDA.w #$0297|!FS_COLOR_BLUE LDA.w #$0297|!FS_COLOR_BLUE
BRA ++ BRA ++
+ +
LDA.w #$0287|!FS_COLOR_GRAY LDA.w #$0287|!FS_COLOR_GRAY
++ : %fs_draw16x8(12,25) ++ : %fs_draw16x8(12,21)
LDA $70037A : AND.w #$0004 : BEQ + LDA $70037A : AND.w #$0004 : BEQ +
LDA.w #$0297|!FS_COLOR_RED LDA.w #$0297|!FS_COLOR_RED
BRA ++ BRA ++
+ +
LDA.w #$0287|!FS_COLOR_GRAY LDA.w #$0287|!FS_COLOR_GRAY
++ : %fs_draw16x8(13,26) ++ : %fs_draw16x8(13,22)
LDA $70037A : AND.w #$0001 : BEQ + LDA $70037A : AND.w #$0001 : BEQ +
LDA.w #$0297|!FS_COLOR_RED LDA.w #$0297|!FS_COLOR_RED
BRA ++ BRA ++
+ +
LDA.w #$0287|!FS_COLOR_GRAY LDA.w #$0287|!FS_COLOR_GRAY
++ : %fs_draw16x8(12,27) ++ : %fs_draw16x8(12,23)
LDA $70037A : AND.w #$0008 : BEQ + LDA $70037A : AND.w #$0008 : BEQ +
LDA.w #$0297|!FS_COLOR_BLUE LDA.w #$0297|!FS_COLOR_BLUE
BRA ++ BRA ++
+ +
LDA.w #$0287|!FS_COLOR_GRAY LDA.w #$0287|!FS_COLOR_GRAY
++ : %fs_draw16x8(13,28) ++ : %fs_draw16x8(13,24)
PLB : PLY : PLX PLB : PLY : PLX
LDA.w #$0004 : STA $02 ; thing we wrote over LDA.w #$0004 : STA $02 ; thing we wrote over
@@ -467,6 +472,8 @@ FileSelectItems:
.pearl .pearl
dw #$0264|!FS_COLOR_RED, #$0265|!FS_COLOR_RED, #$0274|!FS_COLOR_RED, #$0275|!FS_COLOR_RED dw #$0264|!FS_COLOR_RED, #$0265|!FS_COLOR_RED, #$0274|!FS_COLOR_RED, #$0275|!FS_COLOR_RED
.no_pendant
dw #$0285|!FS_COLOR_GRAY, #$0286|!FS_COLOR_GRAY, #$02B2|!FS_COLOR_GRAY, #$0296|!FS_COLOR_GRAY
.green_pendant .green_pendant
dw #$0285|!FS_COLOR_GREEN, #$0286|!FS_COLOR_GREEN, #$0295|!FS_COLOR_GREEN, #$0296|!FS_COLOR_GREEN dw #$0285|!FS_COLOR_GREEN, #$0286|!FS_COLOR_GREEN, #$0295|!FS_COLOR_GREEN, #$0296|!FS_COLOR_GREEN
.blue_pendant .blue_pendant