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

Browse Source

# Conflicts:
#	goalitem.asm
#	inventory.asm
#	invertedmaps.asm
#	newhud.asm
#	pendantcrystalhud.asm

Also some bugfixes here and there

...

This commit is contained in:

aerinon

2023-08-24 16:16:31 -06:00

parent f1dda4a8c0 188c965fbc

commit 09702e659d

22 changed files with 955 additions and 809 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

907

invertedmaps.asm

File diff suppressed because it is too large Load Diff