More sprite fixes

bookofmudora.asm

@@ -39,8 +39,7 @@ LoadBonkItemGFX_inner:
         PHA : PHX
         LDA.w SpriteID,X : TAX
         LDA.l SpriteProperties_standing_width,X : BNE +
-                LDA.b #$00 : STA.l SpriteOAM   ; Move narrow items back to the left
+                LDA.b #$00 : STA.l SpriteOAM : STA.l SpriteOAM+8
-                LDA.b #$00 : STA.l SpriteOAM+8 ;
         +
         PLX : PLA
 RTL

goalitem.asm

@@ -195,10 +195,9 @@ KillGanon:
 	CMP.b #$06 : BNE .exit
 
 .light_speed
-	LDA.l OverworldEventDataWRAM+$5B : ORA.b #$20 : STA.l OverworldEventDataWRAM+$5B ; pyramid hole
+        REP #$20
-	LDA.b #$08 : STA.l RoomDataWRAM[$00].high ; kill ganon
+        LDA.w #$0019 : STA.b GameMode
-	LDA.b #$02 : STA.l MoonPearlEquipment ; pearl but invisible in menu
+        SEP #$20
-
 .exit
 	RTL
 

itemdatatables.asm

@@ -416,7 +416,7 @@ macro SpriteProps(id, chest_width, standing_width, chest_pal, standing_pal, addr
 	pullpc
 endmacro
 
-%SpriteProps($00, 2, 2, $02, $02, PalettesVanilla_blue_ice+$0E)         ; 00 - Fighter sword & Shield
+%SpriteProps($00, 0, 2, $05, $02, PalettesVanilla_blue_ice+$0E)         ; 00 - Fighter sword & Shield
 %SpriteProps($01, 0, 2, $05, $05, PalettesCustom_master_sword)          ; 01 - Master sword
 %SpriteProps($02, 0, 2, $05, $01, PalettesCustom_tempered_sword)        ; 02 - Tempered sword
 %SpriteProps($03, 0, 2, $05, $04, PalettesCustom_golden_sword)          ; 03 - Golden sword

utilities.asm

@@ -69,6 +69,10 @@ RTL
 ;-------------------------------------------------------------------------------- 20/847B
 LoadDynamicTileOAMTable:
         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.w SpriteID,X
@@ -76,27 +80,23 @@ LoadDynamicTileOAMTable:
         STA.l SpriteOAM+5 : STA.l SpriteOAM+13
         PHX
         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
 
         .narrow
         REP #$20
-        LDA.w #$0004 : STA.l SpriteOAM
-        LDA.w #$0000 : STA.l SpriteOAM+2
-        LDA.w #$0200 : STA.l SpriteOAM+6
-
         LDA.w #$0400 : STA.l SpriteOAM+7 : STA.l SpriteOAM+14
+        LDA.w #$0000 : STA.l SpriteOAM+14
         LDA.w #$0800 : STA.l SpriteOAM+9
         LDA.w #$3400 : STA.l SpriteOAM+11
 
+        SEP #$20
+        LDA.b #$04 : STA.l SpriteOAM
+
         .done
         TXA
         PLX
         PLP
 RTS
-
 ;--------------------------------------------------------------------------------
 ; DrawDynamicTile
 ; in:	A - Loot ID