Merge remote-tracking branch 'baserom/master' into MergeDecompression

# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	bookofmudora.asm
#	build.bat
#	catfish.asm
#	compasses.asm
#	contrib.asm
#	darkworldspawn.asm
#	entrances.asm
#	events.asm
#	floodgatesoftlock.asm
#	flute.asm
#	framehook.asm
#	goalitem.asm
#	halfmagicbat.asm
#	heartpieces.asm
#	hooks.asm
#	inventory.asm
#	invertedmaps.asm
#	itemtext_lower.asm
#	lampmantlecone.asm
#	mantle.asm
#	msu.asm
#	music.asm
#	newhud.asm
#	newitems.asm
#	pendantcrystalhud.asm
#	ram.asm
#	rngfixes.asm
#	roomloading.asm
#	shopkeeper.asm
#	stats.asm
#	stats/credits.asm
#	stats/creditsnew.asm
#	stats/statConfig.asm
#	tables.asm
#	tablets.asm
#	utilities.asm
#	zoraking.asm

halfmagicbat.asm

@@ -7,10 +7,10 @@ GetMagicBatItem:
 	CMP.b #$FF : BEQ .normalLogic
 	TAY
 	PHA : LDA MagicBatItem_Player : STA !MULTIWORLD_ITEM_PLAYER_ID : PLA
-	STZ $02E9 ; 0 = Receiving item from an NPC or message
+	STZ.b ItemReceiptMethod ; 0 = Receiving item from an NPC or message
 	JML.l Link_ReceiveItem
 .normalLogic
-	LDA HalfMagic
-	STA MagicConsumption
+	LDA.l HalfMagic
+	STA.l MagicConsumption
 RTL
 ;--------------------------------------------------------------------------------