alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v31.2.0 fixes

Browse Source
This commit is contained in:
cassidoxa
2023-08-19 14:33:24 -04:00
parent 71d3f6cefe
commit 8a63b7ca91
4 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
heartpieces.asm
View File

@@ -42,13 +42,18 @@ DrawHeartPieceGFX:
LDA.l SpriteProperties_standing_width,X : BNE + LDA.l SpriteProperties_standing_width,X : BNE +
PLX PLX
LDA.w SpriteControl, X : ORA.b #$20 : STA.w SpriteControl, X LDA.w SpriteControl, X : ORA.b #$20 : STA.w SpriteControl, X
BRA .draw PLA
JSL.l DrawDynamicTile
LDA.b Scrap00
CLC : ADC.b #$04
STA.b Scrap00
JSL.l Sprite_DrawShadowLong
BRA .done
+ +
PLX PLX
.draw
PLA PLA
JSL.l DrawDynamicTile JSL.l DrawDynamicTile
JSL.l Sprite_DrawShadowLong JSL.l Sprite_DrawShadowLong
.done .done
PLY : PLA PLY : PLA
.offscreen .offscreen

4
itemdatatables.asm
View File

@@ -945,7 +945,7 @@ ItemReceiptGraphicsOffsets:
dw $0 ; 69 - dw $0 ; 69 -
dw $0060 ; 6A - Triforce dw $0060 ; 6A - Triforce
dw $11E0 ; 6B - Power star dw $11E0 ; 6B - Power star
dw $0 ; 6C - dw $0060 ; 6C - Triforce Piece
dw $0 ; 6D - Server request item dw $0 ; 6D - Server request item
dw $0 ; 6E - Server request item (dungeon drop) dw $0 ; 6E - Server request item (dungeon drop)
dw $0 ; 6F - dw $0 ; 6F -
@@ -1215,7 +1215,7 @@ StandingItemGraphicsOffsets:
dw $0 ; 69 - dw $0 ; 69 -
dw $0060 ; 6A - Triforce dw $0060 ; 6A - Triforce
dw $11E0 ; 6B - Power star dw $11E0 ; 6B - Power star
dw $0 ; 6C - dw $0060 ; 6C - Triforce Piece
dw $0 ; 6D - Server request item dw $0 ; 6D - Server request item
dw $0 ; 6E - Server request item (dungeon drop) dw $0 ; 6E - Server request item (dungeon drop)
dw $0 ; 6F - dw $0 ; 6F -

22
newhud.asm
View File

@@ -395,7 +395,7 @@ UpdateHearts:
PHX PHX
PLB PLB
LDA.w $7EF36C LDA.w MaximumHealth
LSR LSR
LSR LSR
LSR LSR
@@ -414,7 +414,11 @@ UpdateHearts:
CPX.b #$01 CPX.b #$01
BMI .done_hearts BMI .done_hearts
JSR.w CheckHeartPalette PHX
LDA.l HUDHeartColors_index : ASL : TAX
LDA.l HUDHeartColors_masks_game_hud,X
PLX
ORA.w #$20A0
CPY.b #$01 CPY.b #$01
BPL .add_heart BPL .add_heart
@@ -450,18 +454,22 @@ UpdateHearts:
BRA .next_filled_heart BRA .next_filled_heart
.done_hearts .done_hearts
LDA.w $7EF36D LDA.w CurrentHealth
AND.w #$0007 AND.w #$0007
BEQ .skip_partial BEQ .skip_partial
CMP.w #$0005 CMP.w #$0005
JSR.w CheckHeartPalette
BCS .more_than_half BCS .more_than_half
INC LDA.l HUDHeartColors_index : ASL : TAX
LDA.l HUDHeartColors_masks_game_hud,X
ORA.w #$20A1
STA.b ($09)
BRA .skip_partial
.more_than_half .more_than_half
LDA.l HUDHeartColors_index : ASL : TAX
LDA.l HUDHeartColors_masks_game_hud,X
ORA.w #$20A0
STA.b ($09) STA.b ($09)
.skip_partial .skip_partial

12
utilities.asm
View File

@@ -69,10 +69,6 @@ RTL
;-------------------------------------------------------------------------------- 20/847B ;-------------------------------------------------------------------------------- 20/847B
LoadDynamicTileOAMTable: LoadDynamicTileOAMTable:
PHP PHP
REP #$20
LDA.w #$0000 : STA.l SpriteOAM : STA.l SpriteOAM+2
LDA.w #$0200 : STA.l SpriteOAM+6
SEP #$20
LDA.b #$24 : STA.l SpriteOAM+4 LDA.b #$24 : STA.l SpriteOAM+4
LDA.w SpriteID,X LDA.w SpriteID,X
@@ -80,11 +76,17 @@ LoadDynamicTileOAMTable:
STA.l SpriteOAM+5 : STA.l SpriteOAM+13 STA.l SpriteOAM+5 : STA.l SpriteOAM+13
PHX PHX
LDA.l SpriteProperties_standing_width,X : BEQ .narrow LDA.l SpriteProperties_standing_width,X : BEQ .narrow
REP #$20
LDA.w #$0000 : STA.l SpriteOAM : STA.l SpriteOAM+2
LDA.w #$0200 : STA.l SpriteOAM+6
BRA .done BRA .done
.narrow .narrow
REP #$20 REP #$20
LDA.w #$0000 : STA.l SpriteOAM+7 : STA.l SpriteOAM+14 LDA.w #$0004 : STA.l SpriteOAM
LDA.w #$0200 : STA.l SpriteOAM+6
LDA.w #$0400 : STA.l SpriteOAM+7 : STA.l SpriteOAM+14
LDA.w #$0800 : STA.l SpriteOAM+9 LDA.w #$0800 : STA.l SpriteOAM+9
LDA.w #$3400 : STA.l SpriteOAM+11 LDA.w #$3400 : STA.l SpriteOAM+11