From 7e513c469663a6ac05d417d709dea3766e33e690 Mon Sep 17 00:00:00 2001
From: cassidoxa <cassidymoen@gmx.com>
Date: Sat, 26 Aug 2023 14:30:39 -0400
Subject: [PATCH] More sprite fixes

---
 bookofmudora.asm   |  3 +--
 goalitem.asm       |  7 +++----
 itemdatatables.asm |  2 +-
 utilities.asm      | 16 ++++++++--------
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/bookofmudora.asm b/bookofmudora.asm
index 5f48936..21f79a3 100644
--- a/bookofmudora.asm
+++ b/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+8 ;
+                LDA.b #$00 : STA.l SpriteOAM : STA.l SpriteOAM+8
         +
         PLX : PLA
 RTL
diff --git a/goalitem.asm b/goalitem.asm
index 8a97dde..9d9afb4 100644
--- a/goalitem.asm
+++ b/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
-	LDA.b #$08 : STA.l RoomDataWRAM[$00].high ; kill ganon
-	LDA.b #$02 : STA.l MoonPearlEquipment ; pearl but invisible in menu
-
+        REP #$20
+        LDA.w #$0019 : STA.b GameMode
+        SEP #$20
 .exit
 	RTL
 
diff --git a/itemdatatables.asm b/itemdatatables.asm
index f2eba04..2416e3c 100644
--- a/itemdatatables.asm
+++ b/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
diff --git a/utilities.asm b/utilities.asm
index 53952f9..cc4e286 100644
--- a/utilities.asm
+++ b/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