From a24329a2ed4d6c3802a9b97d24f7d146fee67ea9 Mon Sep 17 00:00:00 2001
From: Karkat <north@tinymagnet.com>
Date: Sat, 3 Mar 2018 22:11:12 -0500
Subject: [PATCH] ice physics eg fix

---
 LTTP_RND_GeneralBugfixes.asm | 13 +++++++------
 swordswap.asm                |  2 ++
 tables.asm                   |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 6b5e304..5f62d23 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -130,11 +130,9 @@ incsrc goalitem.asm
 incsrc compasses.asm
 incsrc doorframefixes.asm
 incsrc music.asm
-incsrc cuccostorm.asm
+incsrc hashalphabet.asm
 incsrc roomloading.asm
 incsrc icepalacegraphics.asm
-incsrc retro.asm
-incsrc hashalphabet.asm
 warnpc $A18000
 
 org $1C8000 ; text tables for translation
@@ -160,6 +158,9 @@ org $A48000 ; code bank - PUT NEW CODE HERE
 incsrc openmode.asm
 incsrc quickswap.asm
 incsrc endingsequence.asm
+incsrc cuccostorm.asm
+incsrc retro.asm
+warnpc $A58000
 
 ;org $228000 ; contrib area
 org $A28000 ; contrib area
@@ -244,13 +245,13 @@ warnpc $AF8401
 ;$22 Contrib Code
 ;$23 Stats & Credits
 ;$24 Code Bank
+;$2F reserved for tournament use
 ;$30 Main Configuration Table
 ;$31 Graphics Bank
 ;$32 Text Bank
 ;$33 Graphics Bank
-;$2F reserved for tournament use
-;$3A reserved for downstream use (Plandomizer)
-;$3B reserved for downstream use (Plandomizer)
+;$3A reserved for downstream use
+;$3B reserved for downstream use
 ;$3F reserved for internal debugging
 ;$7F5700 - $7F57FF reserved for downstream use
 ;================================================================================
diff --git a/swordswap.asm b/swordswap.asm
index 492f767..9da65e0 100644
--- a/swordswap.asm
+++ b/swordswap.asm
@@ -79,12 +79,14 @@ RTL
 ; $7F50C7 - Ice Modifier
 LoadModifiedIceFloorValue_a11:
 	LDA $5D : CMP #$01 : BEQ + : CMP #$17 : BEQ + : CMP #$1C : BEQ +
+	LDA $5E : CMP #$02 : BEQ +
 	LDA $5B : BNE +
 		LDA.w $0348 : ORA $7F50C7 : AND.b #$11 : RTL
 	+ : LDA.w $0348 : AND.b #$11
 RTL
 LoadModifiedIceFloorValue_a01:
 	LDA $5D : CMP #$01 : BEQ + : CMP #$17 : BEQ + : CMP #$1C : BEQ +
+	LDA $5E : CMP #$02 : BEQ +
 	LDA $5B : BNE +
 		LDA.w $0348 : ORA $7F50C7 : AND.b #$01 : RTL
 	+ : LDA.w $0348 : AND.b #$01
diff --git a/tables.asm b/tables.asm
index 195da3a..5a0f52e 100644
--- a/tables.asm
+++ b/tables.asm
@@ -1478,7 +1478,7 @@ db $FF, $FF, $FF, $FF
 org $30C800 ; PC 0x184800 - 0x18487F - max 16 shops
 ShopTable:
 ;db [id][roomID-low][roomID-high][doorID][zero][shop_config][shopkeeper_config][sram_index]
-db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+;db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
 db $01, $FF, $00, $00, $00, $43, $A0, $00
 ;db $01, $0F, $01, $57, $00, $03, $C1, $00
 db $02, $0F, $01, $60, $00, $03, $C1, $03