From 1b3a586a57c19ccd9fa1ef906a4462dedc62989c Mon Sep 17 00:00:00 2001
From: caitsith2 <d_good@caitsith2.com>
Date: Sun, 7 Jun 2020 05:05:17 -0700
Subject: [PATCH] Update multiworld to be compatible with save & quit delay
 fix.

---
 LTTP_RND_GeneralBugfixes.asm |  2 +-
 multiworld.asm               |  8 +-------
 multiworldplayernames.asm    | 13 ++++++++++++-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index c3ab933..c52b101 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -302,7 +302,7 @@ Extra_Text_Table:
 incsrc itemtext.asm
 warnpc $32E000
 
-org $32E000
+org $32DFD0	; PC 0x195FD0
 incsrc multiworldplayernames.asm
 warnpc $330000
 
diff --git a/multiworld.asm b/multiworld.asm
index cb3850a..f1f6990 100644
--- a/multiworld.asm
+++ b/multiworld.asm
@@ -1,10 +1,4 @@
-;"received from " 28 bytes
-HUD_ReceivedFrom:
-dw $296E, $2961, $295F, $2961, $2965, $2972, $2961, $2960, $007F, $2962, $296E, $296B, $2969, $007F
 
-;"sent to " 16 bytes
-HUD_SentTo:
-dw $296F, $2961, $296A, $2970, $007F, $2970, $296B, $007F
 
 macro Print_Text(hdr, hdr_len, player_id)
 PHX : PHY : PHP
@@ -26,7 +20,7 @@ PHX : PHY : PHP
 	ASL #5
 	TAX
 	-
-	CPY <hdr_len>+#$20 : !BGE ++
+	CPY <hdr_len>+$20 : !BGE ++
 		LDA PlayerNames, X
 		PHX : TYX : STA !MULTIWORLD_HUD_CHARACTER_DATA, X : PLX
 		INX #2 : INY #2
diff --git a/multiworldplayernames.asm b/multiworldplayernames.asm
index 9a012d0..eeb79cc 100644
--- a/multiworldplayernames.asm
+++ b/multiworldplayernames.asm
@@ -1,5 +1,16 @@
+;org $32DFD0	; PC 0x195FD0
+;"received from " 28 bytes
+HUD_ReceivedFrom:
+dw $296E, $2961, $295F, $2961, $2965, $2972, $2961, $2960, $007F, $2962, $296E, $296B, $2969, $007F
+
+;org $32DFEC	; PC 0x195FEC
+;"sent to " 16 bytes
+HUD_SentTo:
+dw $296F, $2961, $296A, $2970, $007F, $2970, $296B, $007F
+
+;org $32DFFC	; PC 0x195FFC
 ;--------------------------------------------------------------------------------
-; Player names (32 bytes/player)
+; Player names (32 bytes/player) - 255 players
 ;--------------------------------------------------------------------------------
 PlayerNames:
 ; Player1