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

@@ -646,14 +646,14 @@ DungeonPrizeReceiptID:
db $00 ; Sewers
db $00 ; Hyrule Castle
db $37 ; Eastern Palace
db $38 ; Desert Palace
db $39 ; Desert Palace
db $00 ; Agahnim's Tower
db $20 ; Swamp Palace
db $20 ; Palace of Darkness
db $20 ; Misery Mire
db $20 ; Skull Woods
db $20 ; Ice Palace
db $39 ; Tower of Hera
db $38 ; Tower of Hera
db $20 ; Thieves' Town
db $20 ; Turtle Rock
;Ether/Nothing: $00