Merged in DR v1.4.1.8

2024-03-16 00:18:53 -05:00
parent 068d97f99b 364fd81a93
commit ba44924d11
8 changed files with 2 additions and 4 deletions
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -240,7 +240,7 @@ warnpc $B1A000

 org $B1A000
 GFX_HUD_Items:
-incbin "data/c2807_v4.gfx"
+incbin "menu/drsheetdc.2bppc"
 warnpc $B1A800

 org $B1A800
--- a/keydrop/standing_items.asm
+++ b/keydrop/standing_items.asm
@@ -424,9 +424,7 @@ RevealSpriteDrop:
 	JMP DoNormalDrop

 CheckIfDropValid:
-	LDA.w SprItemFlags, X : BIT.b #$80 : BNE .do_the_drop  ; it's a minor item
 	JSR CheckIfDropsInThisLocation : BCC DoNormalDrop
-	.do_the_drop
 	;This section sets up the drop
 		LDA.b #$02 : STA.w SpawnedItemFlag
 		STX.w SpawnedItemIndex
--- a/menu/drfont.2bpp
+++ b/menu/drfont.2bpp
--- a/menu/drfont.png
+++ b/menu/drfont.png
--- a/menu/drsheetdc.2bppc
+++ b/menu/drsheetdc.2bppc
--- a/menu/drsheetdc.png
+++ b/menu/drsheetdc.png
--- a/menu/hudalpha.asm
+++ b/menu/hudalpha.asm
@@ -20,4 +20,4 @@ UploadMenuOnlyIcons:
    RTL

 MenuOnlyIcons:
-incbin "menuonly.2bpp"
+incbin "drfont.2bpp"
--- a/menu/menuonly.2bpp
+++ b/menu/menuonly.2bpp