From f5bb17f771c4d8b661b2f6f8e03a5155e1df8dae Mon Sep 17 00:00:00 2001
From: Karkat <north@tinymagnet.com>
Date: Fri, 11 Aug 2017 23:17:13 -0400
Subject: [PATCH] let's dev aug 11 2017

pre-moved mantle to the side when zelda already rescued
fixed bombos tablet item drop problem common to glitched mode (extra bombos drop)
---
 LTTP_RND_GeneralBugfixes.asm |  6 +++++-
 hooks.asm                    | 14 +++++++++++---
 mantle.asm                   | 12 ++++++++++++
 3 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 mantle.asm

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 6014b98..505b882 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -26,7 +26,7 @@ org $3FFFFF ; <- 1FFFFF
 db #$00 ; expand file to 2mb
 
 org $1FFFF8 ; <- FFFF8 timestamp rom
-db #$20, #$17, #$08, #$09 ; year/month/day
+db #$20, #$17, #$08, #$11 ; year/month/day
 
 ;================================================================================
 
@@ -102,6 +102,7 @@ incsrc flute.asm
 incsrc dungeondrops.asm
 incsrc halfmagicbat.asm
 incsrc newitems.asm
+incsrc mantle.asm
 incsrc swordswap.asm
 incsrc stats.asm
 incsrc scratchpad.asm
@@ -377,6 +378,9 @@ Ancilla_SetOam_XY_Long:
 org $0985E2 ; (break on $0985E4)
 AddReceivedItem:
 
+org $098BAD
+AddPendantOrCrystal:
+
 org $0993DF
 AddDashTremor:
 
diff --git a/hooks.asm b/hooks.asm
index deb99f4..902d2a4 100644
--- a/hooks.asm
+++ b/hooks.asm
@@ -713,9 +713,14 @@ JSL.l ItemCheck_BombosTablet
 org $05F285 ; <- 2F285
 JSL.l ItemCheck_EtherTablet
 ;--------------------------------------------------------------------------------
-org $098BCC ; <- 48BCC - ancilla_init.asm : 1679 (LDA AddReceiveItem.item_graphics_indices, Y : STA $72)
-;JSL.l SetTabletItem
-JSL SpawnTabletItem : PLX : PLB : RTL
+;org $098BCC ; <- 48BCC - ancilla_init.asm : 1679 (LDA AddReceiveItem.item_graphics_indices, Y : STA $72)
+;;JSL.l SetTabletItem
+;JSL SpawnTabletItem : PLX : PLB : RTL
+;--------------------------------------------------------------------------------
+org $07859F ; <- 3859F - Bank07.asm : 965 (JSL AddPendantOrCrystal)
+JSL SpawnTabletItem
+org $07862A ; <- 3862A - Bank07.asm : 1064 (JSL AddPendantOrCrystal)
+JSL SpawnTabletItem
 ;--------------------------------------------------------------------------------
 
 ;================================================================================
@@ -1748,6 +1753,9 @@ JSL.l CheckForZelda
 org $1AFC55 ; <- D7C55 - sprite_movable_mantle.asm:34 (LDA $7EF34A : BEQ .return)
 NOP #6 ; remove check
 ;--------------------------------------------------------------------------------
+org $068841 ; <- 30841 - sprite_prep.asm:269 (LDA $0D00, X : ADD.b #$03 : STA $0D00, X)
+JSL.l Mantle_CorrectPosition : NOP #2
+;--------------------------------------------------------------------------------
 org $0DFA53 ; <- 6FA53 - hud check for lantern
 JSL.l LampCheck
 ;--------------------------------------------------------------------------------
diff --git a/mantle.asm b/mantle.asm
new file mode 100644
index 0000000..fd5d1cd
--- /dev/null
+++ b/mantle.asm
@@ -0,0 +1,12 @@
+;================================================================================
+; Mantle Object Changes
+;--------------------------------------------------------------------------------
+Mantle_CorrectPosition:
+	LDA $7EF3C6 : AND.b #$04 : BEQ +
+		LDA.b #$0A : STA $0D10, X ; just spawn it off to the side where we know it should be
+		LDA.b #$03 : STA $0D30, X
+		LDA.b #$90 : STA $0ED0, X
+	+
+	LDA $0D00, X : !ADD.b #$03 ; thing we did originally
+RTL
+;--------------------------------------------------------------------------------
\ No newline at end of file