Merge pull request #104 from tcprescott/patch-1

Remove Quickswap enforcement and fix firebars

LTTP_RND_GeneralBugfixes.asm

@@ -142,6 +142,7 @@ incsrc doorframefixes.asm
 incsrc music.asm
 incsrc roomloading.asm
 incsrc icepalacegraphics.asm
+incsrc firebarlayer.asm
 warnpc $A18000
 
 org $1C8000 ; text tables for translation

build_linux.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+rm ../working.sfc
+cp ../alttp.sfc ../working.sfc
+asar LTTP_RND_GeneralBugfixes.asm ../working.sfc

firebarlayer.asm

@@ -0,0 +1,8 @@
+NewFireBarDamage:
+{
+    LDA $00EE : CMP $0F20, X : BNE .NotSameLayer
+        JSL Sprite_AttemptDamageToPlayerPlusRecoilLong
+        RTL
+    .NotSameLayer
+    RTL
+}

hooks.asm

@@ -2550,8 +2550,19 @@ CheckIfReading:
     CPX #$04
     RTS
 ;================================================================================
+
 org $0DB4CA : db $40, $40 ; fire bar statis
 org $0DB4A9 : db $50, $50, $6E, $6E ; roller statis
 org $0DB4B2 : db $40, $40, $40, $40 ; cannon statis
 org $0DB4C3 : db $C0 ; anti fairy statis
-org $0DB516 : db $40 ; chain chomp statis
+org $0DB516 : db $40 ; chain chomp statis
+
+;--------------------------------------------------------------------------------
+; Keep Firebar Damage on Same Layer
+;--------------------------------------------------------------------------------
+org $06F425
+Sprite_AttemptDamageToPlayerPlusRecoilLong:
+
+org $1ED1B6
+JSL NewFireBarDamage
+;================================================================================

quickswap.asm

@@ -11,12 +11,6 @@ QuickSwap:
 	LDA.l QuickSwapFlag : BEQ .done
 	LDA.w $0202 : BEQ .done ; Skip everything if we don't have any items
 
-	;TODO add romtype and race rom checks here
-	LDA.l TournamentSeed : BEQ +
-	LDA.l GameType : AND.b #$02 : BNE +	
-		BRA .done
-	+
-
 	PHX
 	XBA ; restore the stashed value
 	CMP.b #$30 : BNE +