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

# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	inventory.asm
#	itemdatatables.asm
#	newitems.asm
This commit is contained in:
aerinon
2023-09-07 12:21:22 -06:00
19 changed files with 579 additions and 691 deletions

View File

@@ -1150,6 +1150,7 @@ OverworldMapChangePointers:
dw $2C18, $2C98
dw $2D0A, $2D0C, $2D10, $2D14
dw $2D16, $2D8A, $2D8C, $2D8E
dw $2C94, $2C92, $2B8E
dw $2D94|!OWW_STOP
dw !OWW_ArbTileCopy