More GK refactors

bugfixes.asm

@@ -278,76 +278,3 @@ ParadoxCaveGfxFix:
     LDX.w #$00C0 : STX.w DAS0L
     BRA .uploadLine
 ;--------------------------------------------------------------------------------
-SetItemRiseTimer:
-	LDA.w ItemReceiptMethod : CMP.b #$01 : BNE .not_from_chest
-		LDA.b #$38 : STA.w AncillaTimer, X
-		RTL
-
-	.not_from_chest
-	JSL ItemIsJunk
-	BEQ .default
-
-	.junk
-	LDA.l JunkItemTimer : AND.b #$3F : STA.w AncillaTimer, X
-	RTL
-
-	.default
-	TYA : STA.w AncillaTimer, X ; What we wrote over
-	RTL
-;--------------------------------------------------------------------------------
-ItemIsJunk:
-	PHX
-	LDA.l JunkItemTimer : BIT.b #$3F : BEQ .not_junk
-	BIT.b #$80 : BNE .check
-	LDA.l !MULTIWORLD_ITEM_PLAYER_ID : BNE .check
-	LDA.l !MULTIWORLD_RECEIVING_ITEM : BNE .check
-	BRA .not_junk
-
-.check
-	LDA.l JunkItemTimer : AND.b #$40
-	BEQ +
-		LDA.b #JunkItems_triforce_end-JunkItems_end
-	+
-	CLC : ADC.b #JunkItems_end-JunkItems-1
-	LDA.w AncillaGet, X
-	TAX
-	-
-		CMP.l JunkItems, X : BEQ .junk
-		DEX : BPL -
-.not_junk
-	PLX
-	LDA.b #$00
-	RTL
-.junk
-	PLX
-	LDA.b #$01
-	RTL
-RTL
-
-JunkItems:
-	db $27 ; Bomb
-	db $28 ; 3 bombs
-	db $31 ; 10 bombs
-	db $34 ; 1 rupee
-	db $35 ; 5 rupees
-	db $36 ; 20 rupees
-	db $40 ; 100 rupees
-	db $41 ; 50 rupees
-	db $42 ; Heart
-	db $43 ; Arrow
-	db $44 ; 10 arrows
-	db $45 ; Small magic
-	db $46 ; 300 rupees
-	db $47 ; 20 rupees green
-	db $59 ; Rupoor
-	db $D1 ; Apples
-	db $D2 ; Fairy
-	db $D3 ; Chicken
-	db $D4 ; Big Magic
-	db $D5 ; 5 Arrows
-	db $D6 ; Good Bee
-.end
-	db $6B ; Power Star
-	db $6C ; Triforce Piece
-.triforce_end
-;--------------------------------------------------------------------------------