diff --git a/contrib.asm b/contrib.asm
index c0bf8f6..576adc0 100644
--- a/contrib.asm
+++ b/contrib.asm
@@ -103,14 +103,10 @@ Sprite_ShowSolicitedMessageIfPlayerFacing_Alt:
 	LDY $1CF1
 	
 	; Check what room we're in so we know which npc we're talking to
-	LDA.b $A0 : CMP #$03 : BEQ .AlcoholicDialog
-				CMP #$05 : BEQ .SahasrahlaDialogs
+	LDA.b $A0 :	CMP #$05 : BEQ .SahasrahlaDialogs
 				CMP #$1C : BEQ .BombShopGuyDialog
 						   BRA .SayNothing
 	
-	.AlcoholicDialog
-		JSL DialogAlcoholic : BRA .SayNothing	
-
 	.SahasrahlaDialogs
 		REP #$20 : LDA.l MapReveal_Sahasrahla : ORA !MAP_OVERLAY : STA !MAP_OVERLAY : SEP #$20
 		JSL DialogSahasrahla : BRA .SayNothing
diff --git a/dialog.asm b/dialog.asm
index 3dc49ad..f3ce258 100644
--- a/dialog.asm
+++ b/dialog.asm
@@ -250,11 +250,6 @@ RTL
 	PLY : PLX : PLA
 RTL
 ;--------------------------------------------------------------------------------
-DialogBlind:
-	%LoadDialogAddress(BlindText)
-	JSL.l Sprite_ShowMessageMinimal
-RTL
-;--------------------------------------------------------------------------------
 DialogFairyThrow:
 	LDA.l Restrict_Ponds : BEQ .normal
 	LDA $7EF35C : ORA $7EF35D : ORA $7EF35E : ORA $7EF35F : BNE .normal
@@ -269,50 +264,26 @@ RTL
 	LDY.b #$00
 RTL
 ;--------------------------------------------------------------------------------
-DialogPyramidFairy:
-	%LoadDialogAddress(PyramidFairyText)
-	JSL.l Sprite_ShowMessageUnconditional
-RTL
-;--------------------------------------------------------------------------------
-DialogTriforce:
-	%LoadDialogAddress(TriforceText)
-	REP #$20 : LDA.w #$0171 : STA $1CF0 : SEP #$20 ; fix border
-	JSL.l Main_ShowTextMessage
-	JSL.l Messaging_Text
-RTL
-;--------------------------------------------------------------------------------
 DialogGanon1:
 	JSL.l CheckGanonVulnerability : BCS +
-		%LoadDialogAddress(GanonText1Alternate)
+		REP #$20 : LDA.w #$018C : STA $1CF0 : SEP #$20
 		BRA ++
 	+
-		%LoadDialogAddress(GanonText1)
+		REP #$20 : LDA.w #$016D : STA $1CF0 : SEP #$20
 	++
 	JSL.l Sprite_ShowMessageMinimal
 RTL
 ;--------------------------------------------------------------------------------
 DialogGanon2:
 	JSL.l CheckGanonVulnerability : BCS +
-		%LoadDialogAddress(GanonText2Alternate)
+		REP #$20 : LDA.w #$018D : STA $1CF0 : SEP #$20
 		BRA ++
 	+
-		%LoadDialogAddress(GanonText2)
+		REP #$20 : LDA.w #$016F : STA $1CF0 : SEP #$20
 	++
 	JSL.l Sprite_ShowMessageMinimal
 RTL
 ;--------------------------------------------------------------------------------
-DialogPedestal:
-	PHA
-	LDA $0202 : CMP.b #$0F : BEQ + ; Show normal text if book is not equipped
-	-
-	PLA : JSL Sprite_ShowMessageUnconditional ; Wacky Hylian Text
-RTL
-	+
-	BIT $F4 : BVC - ; Show normal text if Y is not pressed
-	%LoadDialogAddress(MSPedestalText)
-	PLA : JSL Sprite_ShowMessageUnconditional ; Text From MSPedestalText (tables.asm)
-RTL
-;--------------------------------------------------------------------------------
 DialogEtherTablet:
 	PHA
 	LDA $0202 : CMP.b #$0F : BEQ + ; Show normal text if book is not equipped
@@ -327,8 +298,10 @@ RTL
 		LDA $7EF359 : CMP.b #$FF : BEQ .yesText : CMP.b #$02 : !BGE .noText
 	;++
 	.yesText
-	%LoadDialogAddress(EtherTabletText)
-	PLA : JSL Sprite_ShowMessageUnconditional ; Text From MSPedestalText (tables.asm)
+	PLA
+	LDA.b #$0c
+	LDY.b #$01
+	JSL Sprite_ShowMessageUnconditional ; Text From MSPedestalText (tables.asm)
 RTL
 	.noText
 	PLA
@@ -348,41 +321,36 @@ RTL
 		LDA $7EF359 : CMP.b #$FF : BEQ .yesText : CMP.b #$02 : !BGE .noText
 	;++
 	.yesText
-	%LoadDialogAddress(BombosTabletText)
-	PLA : JSL Sprite_ShowMessageUnconditional ; Text From MSPedestalText (tables.asm)
+	PLA 
+	LDA.b #$0D
+	LDY.b #$01
+	JSL Sprite_ShowMessageUnconditional ; Text From MSPedestalText (tables.asm)
 RTL
 	.noText
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
-DialogUncle:
-	;%LoadDialog(UncleQuote,DialogUncleData)
-	%LoadDialogAddress(UncleText)
-	JSL Sprite_ShowMessageUnconditional
-RTL
-;--------------------------------------------------------------------------------
 DialogSahasrahla:
 	LDA.l $7EF374 : AND #$04 : BEQ + ;Check if player has green pendant
-		%LoadDialogAddress(SahasrahlaAfterItemText)
+		LDA.b #$35
+        LDY.b #$00
 		JSL.l Sprite_ShowMessageUnconditional
 		RTL
 	+
-	%LoadDialogAddress(SahasrahlaNoPendantText)
-	JSL.l Sprite_ShowMessageUnconditional
-RTL
-;--------------------------------------------------------------------------------
-DialogAlcoholic:
-	%LoadDialogAddress(AlcoholicText)
+	LDA.b #$31
+    LDY.b #$00
 	JSL.l Sprite_ShowMessageUnconditional
 RTL
 ;--------------------------------------------------------------------------------
 DialogBombShopGuy:
 	LDA.l $7EF37A : AND #$05 : CMP #$05 : BEQ + ;Check if player has crystals 5 & 6
-		%LoadDialogAddress(BombShopGuyNoCrystalsText)
+		LDA.b #$15
+        LDY.b #$01
 		JSL.l Sprite_ShowMessageUnconditional
 		RTL
 	+
-	%LoadDialogAddress(BombShopGuyText)
+	LDA.b #$16
+    LDY.b #$01
 	JSL.l Sprite_ShowMessageUnconditional
 RTL
 ;--------------------------------------------------------------------------------
diff --git a/hooks.asm b/hooks.asm
index 00ad93d..fab3c41 100644
--- a/hooks.asm
+++ b/hooks.asm
@@ -438,9 +438,6 @@ JSL.l LoadSwordForDamage ; moth gold sword fix
 org $08C5F7 ; <- 445F7 - ancilla_receive_item.asm : 400 (LDA.b #$09 : STA $012D)
 NOP #5 ; remove spooky telepathy sound
 ;--------------------------------------------------------------------------------
-org $1EE094 ; PC 0xF6094 - sprite_hylian_plaque.asm : 79 (JSL Sprite_ShowMessageUnconditional)
-JSL.l DialogPedestal
-;--------------------------------------------------------------------------------
 org $08C431 ; <- 44431 - ancilla_receive_item.asm : 125 (LDA $0C5E, X : CMP.b #$01 : BNE .notMasterSword2)
 JSL.l MSMusicReset : NOP
 ;LDA $8A : CMP.b #$80 : NOP
@@ -636,12 +633,6 @@ db 80 ; BRA
 org $05DEF8 ; <- 2DEF8 - sprite_uncle_and_priest.asm : 917 (LDA.b #$05)
 LDA.b #$00
 ;--------------------------------------------------------------------------------
-org $05DE6A ; <- 2DE6A - sprite_uncle_and_priest.asm : 796 (JSL Sprite_ShowMessageUnconditional)
-NOP #4
-;--------------------------------------------------------------------------------
-org $05DE9E ; <- 2DE9E - sprite_uncle_and_priest.asm : 845 (JSL Sprite_ShowMessageUnconditional)
-JSL.l DialogUncle
-;--------------------------------------------------------------------------------
 ;org $1EEAB6 ; <- F6AB6 - sprite_old_mountain_man.asm : 338 (LDA.b #$A0 : STA $7EF372)
 ;JSL.l RefillHealthPlusMagic8bit
 ;NOP #2
@@ -1373,24 +1364,13 @@ NOP #6 ; remove crystal room cutscene check that causes softlocks
 org $06C7BB ; <- 347BB - sprite_ponds.asm:702 (JSL Sprite_ShowMessageFromPlayerContact : BCC BRANCH_ALPHA)
 JSL.l FairyPond_Init
 ;--------------------------------------------------------------------------------
-org $08C5ED ; <- 445ED - ancilla_receive_item.asm:395 (STA $1CF0 : CMP.w #$0070 : BNE .notGeezerSpeech)
-NOP #3
-;--------------------------------------------------------------------------------
-org $02A005 ; <- 12005 - Bank02.asm:5667 (JSL Main_ShowTextMessage)
-JSL.l DialogTriforce : NOP #4
-;--------------------------------------------------------------------------------
 org $1D92EC ; <- E92EC - sprite_ganon.asm:947 (JSL Sprite_ShowMessageMinimal)
 JSL.l DialogGanon1
 ;--------------------------------------------------------------------------------
 org $1D9078 ; <- E9078 - sprite_ganon.asm:552 (LDA.b #$70 : STA $1CF0)
 JSL.l DialogGanon2 : RTS
 ;--------------------------------------------------------------------------------
-org $1DA4EC ; <- EA4EC - sprite_blind_entities.asm:845 (JSL Sprite_ShowMessageMinimal)
-JSL.l DialogBlind
-;--------------------------------------------------------------------------------
-org $06C94C ; <- 3494C - sprite_ponds.asm:970 (JSL Sprite_ShowMessageUnconditional)
-JSL.l DialogPyramidFairy
-;--------------------------------------------------------------------------------
+;-- Disable Capitalism fairy
 org $06C454 ; <- 34454 - sprite_ponds.asm:133 (LDA $0D80, X)
 LDA.b #$00 : NOP
 ;--------------------------------------------------------------------------------
@@ -1413,10 +1393,18 @@ JSL.l Sprite_ShowSolicitedMessageIfPlayerFacing_Alt
 ;-- Sahasrahla (have boots, have ice rod, have 3 pendants, have master sword)
 org $05F1D8 ; <- 2F1D8 sprite_elder.asm:204 (JSL Sprite_ShowSolicitedMessageIfPlayerFacing)
 JSL.l Sprite_ShowSolicitedMessageIfPlayerFacing_Alt
-;--------------------------------------------------------------------------------
-;-- drinking guy
-org $1EF61C ; <- F761C sprite_drinking_guy.asm:29 (JSL Sprite_ShowSolicitedMessageIfPlayerFacing)
-JSL.l Sprite_ShowSolicitedMessageIfPlayerFacing_Alt
+;----------------------------------------------------------
+;-- Bomb shop guy (talking to him before and after big bomb is available)
+org $1EE181 ; <- F6181 sprite_bomb_shop_entity.asm : 85 (JSL Sprite_ShowSolicitedMessageIfPlayerFacing)
+JSL Sprite_ShowSolicitedMessageIfPlayerFacing_Alt
+;----------------------------------------------------
+;-- Bombos tablet
+org $05F3BF ; <- 2F3BF sprite_medallion_tablet.asm : 254 (JSL Sprite_ShowMessageUnconditional)
+JSL.l DialogBombosTablet
+;----------------------------------------------------
+;-- Ether tablet
+org $05F429 ; <- 2F429 sprite_medallion_tablet.asm : 317 (JSL Sprite_ShowMessageUnconditional)
+JSL.l DialogEtherTablet
 ;================================================================================
 
 ;================================================================================
@@ -1439,265 +1427,75 @@ org $08C3FD ; <- 443FD - ancilla_receive_item.asm : 89
 LDA #$40 : STA !MS_GOT
 ;;NOP #6 ; don't set master sword follower
 ;--------------------------------------------------------------------------------
-org $08C5FE ; <- 445FE - ancilla_receive_item.asm : 408
-NOP #4
-;--------------------------------------------------------------------------------
-org $1ED467 ; <- F5467 - sprite_agahnim.asm : 202
-NOP #4
-;--------------------------------------------------------------------------------
-org $1ED4FF ; <- F54FF - sprite_agahnim.asm : 328
-NOP #4
-;--------------------------------------------------------------------------------
-;org $029C94 ; <- 11C94 - Bank02.asm : 5197 (JSL Main_ShowTextMessage)
-;NOP #4
-;--------------------------------------------------------------------------------
-org $029CBD ; <- 11CBD - Bank02.asm : 5227 (JSL Messaging_Text)
-STZ $11
-NOP #2
-;--------------------------------------------------------------------------------
-;org $029CD3 ; <- 11CD3 - Bank02.asm : 5237 (BNE BRANCH_BETA)
-;db $80 ; BRA
-;--------------------------------------------------------------------------------
-org $029CDF ; <- 11CDF - Bank02.asm : 5245 (JSL Main_ShowTextMessage)
-NOP #4
-;--------------------------------------------------------------------------------
-org $029CF0 ; <- 11CF0 - Bank02.asm : 5266
-STZ $11
-NOP #2
-;--------------------------------------------------------------------------------
-org $05FB70 ; <- 2FB70 - sprite_mad_batter.asm:131 - (JSL Sprite_ShowMessageUnconditional)
-NOP #4
-;--------------------------------------------------------------------------------
-org $05FBC2 ; <- 2FBC3 - sprite_mad_batter.asm:195 - (JSL Sprite_ShowMessageUnconditional)
-NOP #4
-;--------------------------------------------------------------------------------
-;org $05F16C ; <- 2F16C - sprite_elder.asm : 137 (JSL Sprite_ShowSolicitedMessageIfPlayerFacing : BCC .dont_show)
-;NOP #4
-;--------------------------------------------------------------------------------
-;org $05F190 ; <- 2F190 - sprite_elder.asm : 170 (JSL Sprite_ShowSolicitedMessageIfPlayerFacing)
-;NOP #4
-;--------------------------------------------------------------------------------
-;org $05F1A8 ; <- 2F1A8 - sprite_elder.asm : 182 (JSL Sprite_ShowSolicitedMessageIfPlayerFacing)
-;NOP #4
-;--------------------------------------------------------------------------------
-;org $05F1BC ; <- 2F1BC - sprite_elder.asm : 194 (JSL Sprite_ShowSolicitedMessageIfPlayerFacing)
-;NOP #4
-;--------------------------------------------------------------------------------
-;org $05F1CE ; <- 2F1CE - sprite_elder.asm : 194 (JSL Sprite_ShowSolicitedMessageIfPlayerFacing)
-;NOP #4
-;--------------------------------------------------------------------------------
-;-- Old mountain man healing text
-org $1EEAD7 ; F6AD7 sprite_old_mountain_man.asm : (JSL Sprite_ShowSolicitedMessageIfPlayerFacing : BCC .didnt_speak)
-JSL Sprite_ShowSolicitedMessageIfPlayerFacing_Edit
-;--------------------------------------------------------------------------------
-;-- Priest healing text
-org $05DE11 ; 2DE11 sprite_uncle_and_priest.asm : 720 (JSL Sprite_ShowSolicitedMessageIfPlayerFacing : BCC .gamma)
-JSL Sprite_ShowSolicitedMessageIfPlayerFacing_Edit
-;--------------------------------------------------------------------------------
-;-- zelda's heal text
-org $05EE38 ; <- 2ee38 sprite_zelda.asm : 474 - (JSL Sprite_ShowSolicitedMessageIfPlayerFacing)
-JSL Sprite_ShowSolicitedMessageIfPlayerFacing_Edit
+;-- Disable all vanilla items (since item message table does not include rando items)
+org $08C5E5 ; <- 445ED - ancilla_receive_item.asm:395 (LDA .item_messages, Y : CMP.w #$FFFF : BEQ .handleGraphics)
+LDA.w #$FFFF
 ;--------------------------------------------------------------------------------
 ;-- zelda in jail
-org $05ED06 ; <- 2ED06 sprite_zelda.asm : 227 - (JSL Sprite_ShowMessageUnconditional)
-STZ $1CE8 : NOP
 org $05ED27 ; <- 2ED27 sprite_zelda.asm : 256 - (JSL Sprite_ShowMessageUnconditional)
-NOP #4
-org $05ED35 ; <- 2ED35 sprite_zelda.asm : 272 - (JSL Sprite_ShowMessageUnconditional)
-NOP #4
+STZ $1CE8 : NOP
 ;----------------------------------------------------
 ;-- sanctuary
-org $05DD83 ; <- 2DD83 sprite_uncle_and_priest.asm : 608 - (JSL Sprite_ShowMessageUnconditional)
-STZ $1CE8 : NOP
-org $05EDC8 ; <- 2EDC8 sprite_zelda.asm : 388 - (JSL Sprite_ShowMessageUnconditional)
-NOP #4
 org $05DDAB ; <- 2DDAB sprite_uncle_and_priest.asm : 635 - (JSL Sprite_ShowMessageUnconditional)
-NOP #4
-;----------------------------------------------------
-;-- Sick Kid
-org $06B9C6 ; <- 339C6 sprite_bug_net_kid.asm : 92 - (JSL Sprite_ShowMessageUnconditional)
-NOP #4
-;----------------------------------------------------
-;-- Hobo
-org $06BE5F ; <- 33E5F sprite_hobo.asm : 121 - (JSL Sprite_ShowMessageUnconditional)
-Nop #4
-;----------------------------------------------------------
-;-- Sahasrahla
-org $05F190 ; <- 2F190 sprite_elder.asm : 154 - (JSL Sprite_ShowSolicitedMessageIfPlayerFacing : BCC .dont_show_2) - "Blah blah blah, take the boots"
-JSL Sprite_ShowSolicitedMessageIfPlayerFacing_Edit
-org $05F212 ; <- 2F212 sprite_elder.asm : 261 - (JSL Sprite_ShowMessageUnconditional) - "Gave you the boots but I'm not doing talking yet"
-NOP #4
-org $05F1ED ; <- 2F1ED sprite_elder.asm : 225 - (JSL Sprite_ShowMessageUnconditional)
-NOP #4
-;----------------------------------------------------------
-;-- Shopkeepers
-org $1EEF7C ; <- F6F7C sprite_shopkeeper.asm : 85 (JSL Sprite_ShowMessageUnconditional)
-NOP #4
-org $1EF375 ; <- F7375 sprite_shopkeeper.asm : 810 (JSL Sprite_ShowMessageUnconditional : JSL ShopKeeper_RapidTerminateReceiveItem)
-NOP #8
-;----------------------------------------------------------
-;-- Bomb shop guy (buying small bombs, and buying big bomb)
-org $1EE1C0 ; <- F61C0 sprite_bomb_shop_entity.asm : 120 (JSL Sprite_ShowMessageUnconditional)
-NOP #4
-org $1EE208 ; <- F6208 sprite_bomb_shop_entity.asm : 178 (JSL Sprite_ShowMessageUnconditional)
-NOP #4
-;-- Text hook for the actual npc
-org $1EE181 ; <- F6181 sprite_bomb_shop_entity.asm : 85 (JSL Sprite_ShowSolicitedMessageIfPlayerFacing)
-JSL Sprite_ShowSolicitedMessageIfPlayerFacing_Alt
-;----------------------------------------------------------
-;-- Catfish
-org $1DE112 ; <- EE112 sprite_great_catfish.asm : 341 (JSL Sprite_ShowMessageMinimal)
-NOP #4
+STZ $1CE8 : NOP
 ;----------------------------------------------------
 ;-- King Zora
-org $059A7D ; <- 29A7D sprite_zora_king.asm : 223 - (JSL Sprite_ShowMessageMinimal)
-STZ $1CE8 : NOP
-;----------------------------------------------------
-;-- Before Agah 1 fight
-org $1DD299 ; <- ED299 sprite_chatty_agahnim.asm : 111 (JSL Sprite_ShowMessageMinimal)
-NOP #4
-org $1DD35E ; <- ED35E sprite_chatty_agahnim.asm : 253 (JSL Sprite_ShowMessageMinimal)
-NOP #4
-;----------------------------------------------------
-;-- Blind Maiden (in jail)
-;org $1EE8CD ; <- F68CD sprite_blind_maiden.asm : 18 - (JSL Sprite_ShowMessageFromPlayerContact : BCC .didnt_speak)
-;NOP #4
-;----------------------------------------------------
-;-- Blind (Maiden) in Jail
-org $1EE8CD ; <- F68CD sprite_blind_maiden.asm : 18 - (JSL Sprite_ShowMessageFromPlayerContact : BCC .didnt_speak)
-JSL Sprite_ShowMessageFromPlayerContact_Edit
+org $059A82 ; <- 29A82 sprite_zora_king.asm : 229 - (LDA $1CE8 : BNE .player_says_just_came_to_visit)
+LDA.b #00 : NOP
+org $059A8D ; <- 29A8d sprite_zora_king.asm : 229 - (LDA $1CE8 : BNE .not_buying)
+LDA.b #00 : NOP
 ;----------------------------------------------------
 ;-- Kiki
 org $1EE3E6 ; <- F63E6 sprite_kiki.asm : 157 pay kiki 10 rupees
 STZ $1CE8 : NOP
-org $1EE400 ; <- F6400 sprite_kiki.asm : 178 thanks for giving kiki rupees
-NOP #4
 org $1EE4FB ; <- F64FB sprite_kiki.asm : 340 pay 100 rupees
 STZ $1CE8 : NOP
-org $1EE523 ; <- F6523 sprite_kiki.asm : 373 kiki will open door
-NOP #4
-
-;org $1EE414 ; <- F6414 sprite_kiki.asm : 193 don't have 10 rupees
-;NOP #4
-;org $1EE50C ; <- F650C sprite_kiki.asm : 356 don't have 100 rupees
-;NOP #4
-;----------------------------------------------------
-;-- Witch
-org $05E4FB ; <- 2E4FB sprite_witch.asm : 165 (JSL Sprite_ShowSolicitedMessageIfPlayerFacing)
-NOP #4
-;----------------------------------------------------
-;-- Breaking Ganon's Tower Seal
-org $08CD3A ; <- 44D3A ancilla_break_tower_seal.asm : 55 (JSL Main_ShowTextMessage)
-NOP #4
-;----------------------------------------------------
-;-- Bombos tablet
-org $05F3BF ; <- 2F3BF sprite_medallion_tablet.asm : 254 (JSL Sprite_ShowMessageUnconditional)
-JSL.l DialogBombosTablet
-;----------------------------------------------------
-;-- Ether tablet
-org $05F429 ; <- 2F429 sprite_medallion_tablet.asm : 317 (JSL Sprite_ShowMessageUnconditional)
-JSL.l DialogEtherTablet
 ;----------------------------------------------------
 ;-- Agahnim 1 Defeated
 org $068475 ; <- 30475 Bank06.asm : 762 - (JSL Sprite_ShowMessageMinimal)
 JSL.l AddInventory_incrementBossSwordLong
 ;NOP #4
-;----------------------------------------------------
-;-- Old Mountain Man Encounter Text
-org $1EE9BC ; <- sprite_old_mountain_man.asm : 157 - (Sprite_ShowMessageFromPlayerContact)
-JSL Sprite_ShowMessageFromPlayerContact_Edit
-
-org $09A67D ; <- 4A67D tagalong.asm : 1152 (JSL OldMountainMan_TransitionFromTagalong)
-JML OldMountainMan_TransitionFromTagalong_Edit
-;----------------------------------------------------------
-;-- Purple Chest Encounter Text
-org $1EE0E7 ; <- F60E7 sprite_thief_chest.asm : 16 (JSL Sprite_ShowMessageFromPlayerContact : BCC .didnt_touch)
-JSL Sprite_ShowMessageFromPlayerContact_Edit
 ;----------------------------------------------------------
 ;-- Middle aged man opens purple chest
 org $06BD44 ; <- 33D44 sprite_middle_aged_man.asm : 107 (JSL Sprite_ShowMessageFromPlayerContact : BCC .return)
 JSL Sprite_ShowMessageFromPlayerContact_Edit
+; ^ still needed because of clearing $1CE8
 ;----------------------------------------------------------
 ;-- Smiths
-;-- Ribbit
-org $06B2AA ; <- 332AA sprite_smithy_bros.asm : 152 (JSL Sprite_ShowSolicitedMessageIfPlayerFacing)
-JSL Sprite_ShowSolicitedMessageIfPlayerFacing_Edit
-
 ;-- Ask us to do anything
 org $06B418 ; <- 33418 sprite_smithy_bros.asm : 371 (JSL Sprite_ShowSolicitedMessageIfPlayerFacing : BCC .player_didnt_speak)
 JSL Sprite_ShowSolicitedMessageIfPlayerFacing_Edit
-
-;-- Your sword is tempered!
-org $06B538 ; <- 33538 sprite_smithy_bros.asm : 602 (JSL Sprite_ShowSolicitedMessageIfPlayerFacing : BCC .no_player_dialogue)
-JSL Sprite_ShowSolicitedMessageIfPlayerFacing_Edit
-
-;-- Brought dwarf home
-org $06B438 ; <- 33438 sprite_smithy_bros.asm : 399 (JSL Sprite_ShowMessageUnconditional)
-NOP #4
-
+; ^ still needed because of clearing $1CE8
 ;-- 10 rupees to temper
 org $06B470 ; <- 33470 sprite_smithy_bros.asm : 447 (JSL Sprite_ShowMessageUnconditional)
-NOP #4
-
+STZ $1CE8 : NOP
 ;-- Yes, I'm sure
 org $06B495 ; <- 33495 sprite_smithy_bros.asm : 479 (JSL Sprite_ShowMessageUnconditional)
-NOP #4
-
+STZ $1CE8 : NOP
 ;-- We'll take your sword
 org $06B4F3 ; <- 334F3 sprite_smithy_bros.asm : 556 (JSL Sprite_ShowMessageUnconditional)
 JSL ItemSet_SmithSword
 ;NOP #4
-
-;-- Smiths can't make your sword any stronger
-org $06B4A1 ; <- 334A1 sprite_smithy_bros.asm : 491 - (Sprite_ShowMessageUnconditional)
-NOP #4
-;----------------------------------------------------------
-;-- Not enough magic text
-org $07B0CC ; <- 3B0CC Bank07.asm : 7767 - (JSL Main_ShowTextMessage)
-NOP #4
-;----------------------------------------------------------
-;-- Witch's Assistant
-org $05F8E7 ; <- 2F8E7 sprite_potion_shop.asm : 603 - (JSL Sprite_ShowSolicitedMessageIfPlayerFacing)
-JSL Sprite_ShowSolicitedMessageIfPlayerFacing_Edit
-org $05F8F5 ; <- 2F8F5 sprite_potion_shop.asm : 620 - (JSL Sprite_ShowSolicitedMessageIfPlayerFacing)
-JSL Sprite_ShowSolicitedMessageIfPlayerFacing_Edit
 ;----------------------------------------------------------
 ;-- Bottle Vendor
 org $05EAE3 ; <- 2EAE3 sprite_bottle_vendor.asm : 104 - (JSL Sprite_ShowSolicitedMessageIfPlayerFacing : BCC .didnt_converse)
 JSL Sprite_ShowSolicitedMessageIfPlayerFacing_Edit
-org $05EB03 ; <- 2EB03 sprite_bottle_vendor.asm : 129 - (JSL Sprite_ShowMessageUnconditional)
-NOP #4
+; ^ still needed because of clearing $1CE8
 ;----------------------------------------------------------
 ;-- Digging Game Guy
 org $1DFC76 ; <- EFC76 sprite_digging_game_guy.asm : 46 (JSL Sprite_ShowSolicitedMessageIfPlayerFacing : BCC .return)
 JSL Sprite_ShowSolicitedMessageIfPlayerFacing_Edit
-org $1DFCA6 ; <- EFCA6 sprite_digging_game_guy.asm : 89 (JSL Sprite_ShowMessageUnconditional)
-NOP #4
+; ^ still needed because of clearing $1CE8
 ;----------------------------------------------------------
 ;-- Flute Boy
 org $06B078 ; <- 33078 sprite_flute_boy.asm : 244 - (JSL Sprite_ShowSolicitedMessageIfPlayerFacing : BCC .didnt_speak)
 JSL Sprite_ShowSolicitedMessageIfPlayerFacing_Edit
-org $06B0AF ; <- 330AF sprite_flute_boy.asm : 308 - (JSL Sprite_ShowMessageUnconditional)
-NOP #4
-;----------------------------------------------------------
-;-- 300 rupee npcs
-org $1EF047 ; <- F7047 sprite_shopkeeper.asm : 227 - (JSL Sprite_ShowSolicitedMessageIfPlayerFacing) (probably)
-JSL Sprite_ShowSolicitedMessageIfPlayerFacing_Edit
+; ^ still needed because of clearing $1CE8
 ;----------------------------------------------------------
 ;-- Chest Game Guy
 org $1EEFBF ; <- F6FBF sprite_shopkeeper.asm : 121 - (JSL Sprite_ShowSolicitedMessageIfPlayerFacing : BCC BRANCH_ALPHA)
 JSL Sprite_ShowSolicitedMessageIfPlayerFacing_Edit
-org $1EEFE0 ; <- F6FE0 sprite_shopkeeper.asm : 144 - (JSL Sprite_ShowMessageUnconditional)
-NOP #4
-;----------------------------------------------------------
-;-- Desert Palace plaque (opening desert with book)
-org $1EE0D2 ; <- F60D2 Sprite_Hylian_Plaque.asm : 127 - (JSL Sprite_ShowMessageUnconditional)
-NOP #4
-;----------------------------------------------------------
-;-- Uncle gives sword
-org $05DF34 ; <- 2DF34 sprite_uncle_and_priest.asm : 961 - (JSL Sprite_ShowMessageFromPlayerContact : BCC .player_not_close_2)
-JSL Sprite_ShowMessageFromPlayerContact_Edit
-;----------------------------------------------------------
+; ^ still needed because of clearing $1CE8
 
 ;===================================
 ;-- Escort Text
diff --git a/i18n_en.bin b/i18n_en.bin
index 3117c65..dde3943 100644
Binary files a/i18n_en.bin and b/i18n_en.bin differ
diff --git a/tables.asm b/tables.asm
index 6344200..f25176d 100644
--- a/tables.asm
+++ b/tables.asm
@@ -919,140 +919,8 @@ db #$01 ; #$00 = On - #$01 = Off (Default)
 ; Plandomizer Author Name (ASCII) - Leave unused chars as 0
 org $308220 ; PC 0x180220
 ;--------------------------------------------------------------------------------
-; 0x180240 - 0x1802FF (unused)
+; 0x180240 - 0x1814FF (unused)
 ;================================================================================
-; $308300 (0x180300) - $3083FF (0x1803FF)
-; MS Pedestal Text (ALTTP JP Text Format)
-org $308300 ; PC 0x180300
-MSPedestalText:
-db $00, $c0, $00, $ae, $00, $d8, $00, $bb, $00, $ae, $00, $ff, $00, $b8, $00, $be, $00, $bd, $00, $ff, $00, $b8, $00, $af
-db $75, $00, $c0, $00, $ae, $00, $ae, $00, $bd, $00, $aa, $00, $ab, $00, $b2, $00, $c1, $00, $cD, $00, $ff, $00, $bd, $00, $b8
-db $76, $00, $bd, $00, $b1, $00, $ae, $00, $ff, $00, $bc, $00, $bd, $00, $b8, $00, $bb, $00, $ae, $00, $c7
-db $7f, $7f
-;--------------------------------------------------------------------------------
-; $308400 (0x180400) - $3084FF (0x1804FF)
-; Triforce Text (ALTTP JP Text Format)
-org $308400 ; PC 0x180400
-TriforceText:
-db $74, $75, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $FF, $00, $B0, $00, $FF, $00, $B0, $7F
-;--------------------------------------------------------------------------------
-; $308500 (0x180500) - $3085FF (0x1805FF)
-; Uncle Text (ALTTP JP Text Format)
-org $308500 ; PC 0x180500
-UncleText:
-db $00, $c0, $00, $ae, $00, $d8, $00, $bb, $00, $ae, $00, $ff, $00, $b8, $00, $be, $00, $bd, $00, $ff, $00, $b8, $00, $af
-db $75, $00, $c0, $00, $ae, $00, $ae, $00, $bd, $00, $aa, $00, $ab, $00, $b2, $00, $c1, $00, $cD, $00, $ff, $00, $bd, $00, $b8
-db $76, $00, $bd, $00, $b1, $00, $ae, $00, $ff, $00, $bc, $00, $bd, $00, $b8, $00, $bb, $00, $ae, $00, $c7
-db $7f, $7f
-;--------------------------------------------------------------------------------
-; $308600 (0x180600) - $3086FF (0x1806FF)
-; Ganon Text 1 (ALTTP JP Text Format)
-org $308600 ; PC 0x180600
-GanonText1:
-db $00, $c0, $00, $ae, $00, $d8, $00, $bb, $00, $ae, $00, $ff, $00, $b8, $00, $be, $00, $bd, $00, $ff, $00, $b8, $00, $af
-db $75, $00, $c0, $00, $ae, $00, $ae, $00, $bd, $00, $aa, $00, $ab, $00, $b2, $00, $c1, $00, $cD, $00, $ff, $00, $bd, $00, $b8
-db $76, $00, $bd, $00, $b1, $00, $ae, $00, $ff, $00, $bc, $00, $bd, $00, $b8, $00, $bb, $00, $ae, $00, $c7
-db $7f, $7f
-;--------------------------------------------------------------------------------
-; $308700 (0x180700) - $3087FF (0x1807FF)
-; Ganon Text 2 (ALTTP JP Text Format)
-org $308700 ; PC 0x180700
-GanonText2:
-db $00, $c2, $00, $b8, $00, $be, $00, $d8, $00, $bb, $00, $ae, $00, $ff, $00, $b0, $00, $b8, $00, $b2, $00, $b7, $00, $b0
-db $75, $00, $bd, $00, $b8, $00, $ff, $00, $b1, $00, $aa, $00, $bf, $00, $ae, $00, $ff, $00, $aa, $00, $ff, $00, $bf, $00, $ae, $00, $bb, $00, $c2
-db $76, $00, $ab, $00, $aa, $00, $ad, $00, $ff, $00, $bd, $00, $b2, $00, $b6, $00, $ae, $00, $cD
-db $7f, $7f
-;--------------------------------------------------------------------------------
-; $308800 (0x180800) - $3088FF (0x1808FF)
-; Blind Text
-org $308800 ; PC 0x180800
-BlindText:
-db $75, $00, $cE, $00, $a6, $00, $a9, $00, $ff, $00, $ab, $00, $b5, $00, $aa, $00, $c3, $00, $ae, $00, $ff, $00, $b2, $00, $bd, $00, $c7, $00, $cE
-db $7f, $7f
-;--------------------------------------------------------------------------------
-; $308900 (0x180900) - $3089FF (0x1809FF)
-; Fat Fairy Text
-org $308900 ; PC 0x180900
-PyramidFairyText:
-db $00, $b1, $00, $ae, $00, $c2, $00, $c7
-db $76, $00, $b5, $00, $b2, $00, $bc, $00, $bd, $00, $ae, $00, $b7, $00, $c7
-db $7f, $7f
-;--------------------------------------------------------------------------------
-; $308A00 (0x180A00) - $308AFF (0x180AFF)
-; SahasrahlaNoPendantText
-org $308A00 ; PC 0x180A00
-SahasrahlaNoPendantText:
-; Want something|for free? Tell|you what|bring me the|green pendant.
-db $74, $00, $C0, $00, $AA, $00, $B7, $00, $BD, $00, $FF, $00, $BC, $00, $B8, $00, $B6, $00, $AE, $00, $BD, $00, $B1, $00, $B2, $00, $B7, $00, $B0, $75, $00, $AF, $00, $B8, $00, $BB, $00, $FF, $00, $AF, $00, $BB, $00, $AE, $00, $AE, $00, $C6, $00, $FF, $00, $BD, $00, $AE, $00, $B5, $00, $B5, $76, $00, $C2, $00, $B8, $00, $BE, $00, $FF, $00, $C0, $00, $B1, $00, $AA, $00, $BD, $00, $CC, $7E, $73, $76, $00, $AB, $00, $BB, $00, $B2, $00, $B7, $00, $B0, $00, $FF, $00, $B6, $00, $AE, $00, $FF, $00, $BD, $00, $B1, $00, $AE, $73, $76, $00, $B0, $00, $BB, $00, $AE, $00, $AE, $00, $B7, $00, $FF, $00, $B9, $00, $AE, $00, $B7, $00, $AD, $00, $AA, $00, $B7, $00, $BD, $00, $CD
-db $7f, $7f
-;--------------------------------------------------------------------------------
-; $308B00 (0x180B00) - $308BFF (0x180BFF)
-; SahasrahlaAfterItemText
-org $308B00 ; PC 0x180B00
-SahasrahlaAfterItemText:
-; I already gave|you all I have|Why don't you|go bother|someone else?
-db $74, $00, $B2, $00, $FF, $00, $AA, $00, $B5, $00, $BB, $00, $AE, $00, $AA, $00, $AD, $00, $C2, $00, $FF, $00, $B0, $00, $AA, $00, $BF, $00, $AE, $75, $00, $C2, $00, $B8, $00, $BE, $00, $FF, $00, $AA, $00, $B5, $00, $B5, $00, $FF, $00, $B2, $00, $FF, $00, $B1, $00, $AA, $00, $BF, $00, $AE, $76, $00, $C0, $00, $B1, $00, $C2, $00, $FF, $00, $AD, $00, $B8, $00, $B7, $00, $D8, $00, $BD, $00, $FF, $00, $C2, $00, $B8, $00, $BE, $7E, $73, $76, $00, $B0, $00, $B8, $00, $FF, $00, $AB, $00, $B8, $00, $BD, $00, $B1, $00, $AE, $00, $BB, $73, $76, $00, $BC, $00, $B8, $00, $B6, $00, $AE, $00, $B8, $00, $B7, $00, $AE, $00, $FF, $00, $AE, $00, $B5, $00, $BC, $00, $AE, $00, $C6
-db $7f, $7f
-;--------------------------------------------------------------------------------
-; $308C00 (0x180C00) - $308CFF (0x180CFF)
-; AlcoholicText
-org $308C00 ; PC 0x180C00
-AlcoholicText:
-; If you haven't|found Quake|yet|it's not your|fault.
-db $74, $00, $B2, $00, $AF, $00, $FF, $00, $C2, $00, $B8, $00, $BE, $00, $FF, $00, $B1, $00, $AA, $00, $BF, $00, $AE, $00, $B7, $00, $D8, $00, $BD, $75, $00, $AF, $00, $B8, $00, $BE, $00, $B7, $00, $AD, $00, $FF, $00, $BA, $00, $BE, $00, $AA, $00, $B4, $00, $AE, $76, $00, $C2, $00, $AE, $00, $BD, $00, $CC, $7E, $73, $76, $00, $B2, $00, $BD, $00, $D8, $00, $BC, $00, $FF, $00, $B7, $00, $B8, $00, $BD, $00, $FF, $00, $C2, $00, $B8, $00, $BE, $00, $BB, $73, $76, $00, $AF, $00, $AA, $00, $BE, $00, $B5, $00, $BD, $00, $CD
-db $7f, $7f
-;--------------------------------------------------------------------------------
-; $308D00 (0x180D00) - $308DFF (0x180DFF)
-; BombShopGuyText
-org $308D00 ; PC 0x180D00
-BombShopGuyText:
-; please deliver|this big bomb|to my fairy|friend in the|pyramid?
-db $74, $00, $B9, $00, $B5, $00, $AE, $00, $AA, $00, $BC, $00, $AE, $00, $FF, $00, $AD, $00, $AE, $00, $B5, $00, $B2, $00, $BF, $00, $AE, $00, $BB, $75, $00, $BD, $00, $B1, $00, $B2, $00, $BC, $00, $FF, $00, $AB, $00, $B2, $00, $B0, $00, $FF, $00, $AB, $00, $B8, $00, $B6, $00, $AB, $76, $00, $BD, $00, $B8, $00, $FF, $00, $B6, $00, $C2, $00, $FF, $00, $AF, $00, $AA, $00, $B2, $00, $BB, $00, $C2, $7E, $73, $76, $00, $AF, $00, $BB, $00, $B2, $00, $AE, $00, $B7, $00, $AD, $00, $FF, $00, $B2, $00, $B7, $00, $FF, $00, $BD, $00, $B1, $00, $AE, $73, $76, $00, $B9, $00, $C2, $00, $BB, $00, $AA, $00, $B6, $00, $B2, $00, $AD, $00, $C6
-db $7f, $7f
-;--------------------------------------------------------------------------------
-; $308E00 (0x180E00) - $308EFF (0x180EFF)
-; BombShopGuyNoCrystalsText
-org $308E00 ; PC 0x180E00
-BombShopGuyNoCrystalsText:
-; bring me the|5th and 6th|crystals so I|can make a big|bomb!
-db $74, $00, $AB, $00, $BB, $00, $B2, $00, $B7, $00, $B0, $00, $FF, $00, $B6, $00, $AE, $00, $FF, $00, $BD, $00, $B1, $00, $AE, $75, $00, $A5, $00, $BD, $00, $B1, $00, $FF, $00, $AA, $00, $B7, $00, $AD, $00, $FF, $00, $A6, $00, $BD, $00, $B1, $76, $00, $AC, $00, $BB, $00, $C2, $00, $BC, $00, $BD, $00, $AA, $00, $B5, $00, $BC, $00, $FF, $00, $BC, $00, $B8, $00, $FF, $00, $B2, $7E, $73, $76, $00, $AC, $00, $AA, $00, $B7, $00, $FF, $00, $B6, $00, $AA, $00, $B4, $00, $AE, $00, $FF, $00, $AA, $00, $FF, $00, $AB, $00, $B2, $00, $B0, $73, $76, $00, $AB, $00, $B8, $00, $B6, $00, $AB, $00, $C7
-db $7f, $7f
-;--------------------------------------------------------------------------------
-; $308F00 (0x180F00) - $308FFF (0x180FFF)
-; EtherTabletText
-org $308F00 ; PC 0x180F00
-EtherTabletText:
-; bring me the|5th and 6th|crystals so I|can make a big|bomb!
-db $74, $00, $AB, $00, $BB, $00, $B2, $00, $B7, $00, $B0, $00, $FF, $00, $B6, $00, $AE, $00, $FF, $00, $BD, $00, $B1, $00, $AE, $75, $00, $A5, $00, $BD, $00, $B1, $00, $FF, $00, $AA, $00, $B7, $00, $AD, $00, $FF, $00, $A6, $00, $BD, $00, $B1, $76, $00, $AC, $00, $BB, $00, $C2, $00, $BC, $00, $BD, $00, $AA, $00, $B5, $00, $BC, $00, $FF, $00, $BC, $00, $B8, $00, $FF, $00, $B2, $7E, $73, $76, $00, $AC, $00, $AA, $00, $B7, $00, $FF, $00, $B6, $00, $AA, $00, $B4, $00, $AE, $00, $FF, $00, $AA, $00, $FF, $00, $AB, $00, $B2, $00, $B0, $73, $76, $00, $AB, $00, $B8, $00, $B6, $00, $AB, $00, $C7
-db $7f, $7f
-;--------------------------------------------------------------------------------
-; $309000 (0x181000) - $3090FF (0x1810FF)
-; BombosTabletText
-org $309000 ; PC 0x181000
-BombosTabletText:
-; please deliver|this big bomb|to my fairy|friend in the|pyramid?
-db $74, $00, $B9, $00, $B5, $00, $AE, $00, $AA, $00, $BC, $00, $AE, $00, $FF, $00, $AD, $00, $AE, $00, $B5, $00, $B2, $00, $BF, $00, $AE, $00, $BB, $75, $00, $BD, $00, $B1, $00, $B2, $00, $BC, $00, $FF, $00, $AB, $00, $B2, $00, $B0, $00, $FF, $00, $AB, $00, $B8, $00, $B6, $00, $AB, $76, $00, $BD, $00, $B8, $00, $FF, $00, $B6, $00, $C2, $00, $FF, $00, $AF, $00, $AA, $00, $B2, $00, $BB, $00, $C2, $7E, $73, $76, $00, $AF, $00, $BB, $00, $B2, $00, $AE, $00, $B7, $00, $AD, $00, $FF, $00, $B2, $00, $B7, $00, $FF, $00, $BD, $00, $B1, $00, $AE, $73, $76, $00, $B9, $00, $C2, $00, $BB, $00, $AA, $00, $B6, $00, $B2, $00, $AD, $00, $C6
-db $7f, $7f
-;--------------------------------------------------------------------------------
-; $309100 (0x181100) - $3091FF (0x1811FF)
-; Ganon Text 1 - Invincible Alternate (ALTTP JP Text Format)
-org $309100 ; PC 0x181100
-GanonText1Alternate:
-; bring me the|5th and 6th|crystals so I|can make a big|bomb!
-db $74, $00, $AB, $00, $BB, $00, $B2, $00, $B7, $00, $B0, $00, $FF, $00, $B6, $00, $AE, $00, $FF, $00, $BD, $00, $B1, $00, $AE, $75, $00, $A5, $00, $BD, $00, $B1, $00, $FF, $00, $AA, $00, $B7, $00, $AD, $00, $FF, $00, $A6, $00, $BD, $00, $B1, $76, $00, $AC, $00, $BB, $00, $C2, $00, $BC, $00, $BD, $00, $AA, $00, $B5, $00, $BC, $00, $FF, $00, $BC, $00, $B8, $00, $FF, $00, $B2, $7E, $73, $76, $00, $AC, $00, $AA, $00, $B7, $00, $FF, $00, $B6, $00, $AA, $00, $B4, $00, $AE, $00, $FF, $00, $AA, $00, $FF, $00, $AB, $00, $B2, $00, $B0, $73, $76, $00, $AB, $00, $B8, $00, $B6, $00, $AB, $00, $C7
-db $7f, $7f
-;--------------------------------------------------------------------------------
-; $309200 (0x181200) - $3092FF (0x1812FF)
-; Ganon Text 2 - Invincible Alternate (ALTTP JP Text Format)
-org $309200 ; PC 0x181200
-GanonText2Alternate:
-; please deliver|this big bomb|to my fairy|friend in the|pyramid?
-db $74, $00, $B9, $00, $B5, $00, $AE, $00, $AA, $00, $BC, $00, $AE, $00, $FF, $00, $AD, $00, $AE, $00, $B5, $00, $B2, $00, $BF, $00, $AE, $00, $BB, $75, $00, $BD, $00, $B1, $00, $B2, $00, $BC, $00, $FF, $00, $AB, $00, $B2, $00, $B0, $00, $FF, $00, $AB, $00, $B8, $00, $B6, $00, $AB, $76, $00, $BD, $00, $B8, $00, $FF, $00, $B6, $00, $C2, $00, $FF, $00, $AF, $00, $AA, $00, $B2, $00, $BB, $00, $C2, $7E, $73, $76, $00, $AF, $00, $BB, $00, $B2, $00, $AE, $00, $B7, $00, $AD, $00, $FF, $00, $B2, $00, $B7, $00, $FF, $00, $BD, $00, $B1, $00, $AE, $73, $76, $00, $B9, $00, $C2, $00, $BB, $00, $AA, $00, $B6, $00, $B2, $00, $AD, $00, $C6
-db $7f, $7f
-;--------------------------------------------------------------------------------
-; $309300 (0x181300) - $3094FF (0x1814FF)
-; free space (unused)
-;--------------------------------------------------------------------------------
 ; $309500 (0x181500) - $309FFF (0x181FFF) original 0x39C bytes
 ; Replacement Ending Sequence Text Data
 ; if you modify this table you will need to modify the pointers to it located at $0EECC0