Merge https://github.com/JohnMai/WhiteSharks
Merge https://github.com/JohnMai/WhiteSharks
Some other chap 4 tweaks

here it is
Maps and shit
Added prelim sound options

Bug: Can change music down, can’t put it back up
Added prelim sound options

Bug: Can change music down, can’t put it back up
Merge branch 'anthonylim' of https://github.com/JohnMai/WhiteSharks into anthonylim
Merge pull request #331 from JohnMai/anthonylim

Add prelim sound options
Merge pull request #332 from Kiroshima/master

Chapter 2 Fixes Mostly
stuff

yeah
Merge pull request #333 from shaitanelnifi/master

some changes that need merging
May walks and more fixes
Merge pull request #334 from mentatzoe/master

May walks and more fixes
set up market place

set up market place
Merge branch 'master' of https://github.com/JohnMai/WhiteSharks
Merge pull request #335 from Kiroshima/master

Scale Mismatch Chapter 2 and Chapter 3
Merge pull request #336 from Kiroshima/master

Faulty Door Fix
Fix dialogue jump with Alexia choice in OfficeEnd

Fixes #328
Fix dialogue jump with Alexia choice in OfficeEnd

Fixes #328
Merge branch 'anthonylim' of https://github.com/JohnMai/WhiteSharks into anthonylim