From 702e1bee5940043da7f9d5208957edd2139a8997 Mon Sep 17 00:00:00 2001
From: Kevin Cathcart <kevincathcart@gmail.com>
Date: Thu, 12 Jul 2018 23:02:52 -0400
Subject: [PATCH] Reclaim 0x1000 Bytes of WRAM from a (nearly) static table
 originally stored compressed.

The nearly is due to the silly hack they used for stalfos bomb
vulnerability. For that I used one byte of WRAM to compensate.
---
 LTTP_RND_GeneralBugfixes.asm |   5 +++++
 damage_table.bin             | Bin 0 -> 4096 bytes
 fileselect.asm               |   7 +++++--
 hooks.asm                    |  19 +++++++++++++++++++
 swordswap.asm                |  10 ++++++++++
 tables.asm                   |   3 +++
 6 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 damage_table.bin

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 19430c8..688e63b 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -226,6 +226,11 @@ IcePalaceFloorGfx:
 incbin ice_palace_floor.bin
 warnpc $31C801
 
+org $31C800
+Damage_Table:
+incbin damage_table.bin
+warnpc $31D801
+
 org $338000
 GFX_HUD_Palette:
 incbin hudpalette.pal
diff --git a/damage_table.bin b/damage_table.bin
new file mode 100644
index 0000000000000000000000000000000000000000..be50a75fe49e04388377b0d8875640c7526386c0
GIT binary patch
literal 4096
zcmeHK>zd;r2=&&QG>N?b+wM7_iLq&?`|b4K((!`85fnA!y;AVrMIVhpJ@D>p)J+*<
z^x1hdI_Th%gHw%y$}30zRDR+Sz@bkdlxFT}A9ANpDR3GA57von@D6`8&dolkJ^fRP
zAqF@X^6Q16_s?YJtOKdx!H+<H=pTKu_%O?epjKKr)O6zCsKw`6d;?sQ(?70Xji3H;
z4dN3&*qhv8DIq|Fhge;IvwnxB^{&@*)cVh#SAdyjgbZfBA+wF@&S-Pk9Q&>J!JhxN
z|2z+=s<;S^PTu&}^8P$Ae?0Q(8LziL%g^@xeZZIy2v7V@mY;P13Z_5uN95Ksx#0n>
z%U6?g4i4*l9MS>3j4%XtCylSWkBm2zqptp-2|&XA@;8JXIH`~PN%$RR54W!WZ_jeu
zSFq(*o6(kfoNwIUk+0U+VBATk`^b=v{kWEo^Zhn|_{W~!n(wDD1HM<5nD4cJmKvU|
z&(-^aM8!>l=c0!~=GW`l%vtkA+204suk)LlMyW@9)wliOIb*zhA9Y5>Hz1vxas^f?
zDt*uKV77d)_0qRi4OD;s9_VLR1Ow}bYro>_df`4hpT`URpN1M9{l$&Ji-<&gET?)&
z-s0u{kTW@E56}Eh6JE#(4+{8!2+!8tv_2|$1cqXD3+EI0TGyBBt><gxO`SErsLtOL
z+?+n1wpnJw`*VlK5Ht^8zSgt3b^X!(;5>fKlTU%^vA$2$VB|l=d7($R6aEW54v*_a
zUhUBY+t1PZR`E4|pg$&Emygwy2G+F;WakgIOB98-^MWpBQ9#tE`;2%H;e&}iBki{T
zAJi81pS;&N2MwcZE3$~JvdIIj7by{J7MZ}#C?bnwjA7^%&Fj7RxyT0nW!^Sf9$;3(
zLY?Pjjf<=?$`rFq*$U>UpdOQr#W~2~&x*MV^xhTPQlDkS@e?DC5)na4ce%M75+b^9
zxui#4lkSm)W*DqVZKaHRUl(}F<tjI{n@B>#;8+v~>4yEqq2Qg0AKcI~)yc#Gfl?S;
z(%H9Oh4?Fe!4>yFVOt_v?8=rTI&p|Tx}4LLr<Aw+kOF5vE&W^;5JnQy0!hMh2UteI
b79;k8-!mZ_;0AYbg4jXLZA(epT<(7W#4saj

literal 0
HcmV?d00001

diff --git a/fileselect.asm b/fileselect.asm
index 25c501f..4d2a553 100644
--- a/fileselect.asm
+++ b/fileselect.asm
@@ -59,5 +59,8 @@ AltBufferTable:
     ; Set last packet marker
     LDA.w #$00FF : STA $11f6
     SEP #$20
- 
-RTL
\ No newline at end of file
+
+RTL
+;------------------------------------------------------------------------------
+Validate_SRAM:
+RTL
diff --git a/hooks.asm b/hooks.asm
index 1b71f3e..d3a0fe0 100644
--- a/hooks.asm
+++ b/hooks.asm
@@ -90,6 +90,25 @@ JSL.l AltBufferTable : NOP #8 ; Selection screen
 org $0cd393 ; Bank0c.asm:2674 (LDX.w #$00FD)
 JSL.l AltBufferTable : NOP #8 ; Delete screen
 ;--------------------------------------------------------------------------------
+org $0CCCCC ;<- 64CCC - Bank0C.asm : 1628 (JSL Intro_ValidateSram) / Bank02.asm : 75 (REP #$30)
+; Explanation: In JP 1.0 the code for Intro_ValidateSram was inline in Bank 0C
+JML.l Validate_SRAM ;(Return via RTL. Original code JML'd to Intro_LoadSpriteStats which returns with RTL, but we want to skip that)
+org $0CCD57 ;<- 64D57 - Bank0C.asm :
+RTL ;Just in case anybody ever removes the previous hook
+;--------------------------------------------------------------------------------
+
+;================================================================================
+; Damage table Relocation from WRAM
+;--------------------------------------------------------------------------------
+org $06EDB5 ;<- 36DBE - Bank06.asm : 4882 (LDA $7F6000, X : STA $02)
+JSL.l LookupDamageLevel
+;--------------------------------------------------------------------------------
+!StalfosBombDamage = "$7F509D"
+org $1eab5e ;<- F2B5E - sprite_stalfos_knight.asm : 135  (LDA.b #$00 : STA $7F6918)
+STA.l !StalfosBombDamage
+org $1eaad6 ;<- F2AB6 - sprite_stalfos_knight.asm : 32  (LDA.b #$02 : STA $7F6918)
+STA.l !StalfosBombDamage
+;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Duck Map Load Hook
diff --git a/swordswap.asm b/swordswap.asm
index af91e83..18a9ab0 100644
--- a/swordswap.asm
+++ b/swordswap.asm
@@ -39,6 +39,16 @@ LoadSwordForDamage:
 	JSR.w LoadModifiedSwordLevel ; load normal sword value
 RTL
 ;================================================================================
+;!StalfosBombDamage = "$7F509D"
+LookupDamageLevel:
+	CPX.w #$6918 : BNE +
+		LDA.l !StalfosBombDamage
+		BRA .done
+	+
+	LDA.l Damage_Table, X
+	.done
+RTL
+;================================================================================
 ; $7F50C0 - Sword Modifier
 LoadModifiedSwordLevel: ; returns short
 	LDA $7F50C0 : BEQ +
diff --git a/tables.asm b/tables.asm
index 74f9ccb..19b4210 100644
--- a/tables.asm
+++ b/tables.asm
@@ -1492,6 +1492,7 @@ dw #9999 ; Rupee Limit
 ; $7F509A - (Reserved)
 ; $7F509B - MSU Flag
 ; $7F509C - Inverted Mode Duck Map Temporary
+; $7F509D - Stalfos Bomb Damage Value
 
 ; $7F50A0 - Event Parameter 1
 
@@ -1518,6 +1519,8 @@ dw #9999 ; Rupee Limit
 ; $7F5200 - $7F52FF - RNG Pointer Block
 ;
 ; $7F5700 - $7F57FF - Dialog Buffer
+;
+; $7F6000 - $7F6FFF - Free RAM (Reclaimed from Damage Table)
 ;================================================================================
 !BIGRAM = "$7EC900";
 ; $7EC900 - Big RAM Buffer ($1F00)