diff --git a/macosx/Snes9x/Info.plist b/macosx/Snes9x/Info.plist
index 3588abd0..18f71614 100644
--- a/macosx/Snes9x/Info.plist
+++ b/macosx/Snes9x/Info.plist
@@ -24,6 +24,10 @@
$(MACOSX_DEPLOYMENT_TARGET)
NSMainNibFile
MainMenu
+ CFBundleHelpBookFolder
+ Snes9x Help
+ CFBundleHelpBookName
+ Snes9x Help
NSPrincipalClass
NSApplication
diff --git a/macosx/docs/FAQ.rtf b/macosx/docs/FAQ.rtf
index b8154b44..8b468822 100644
--- a/macosx/docs/FAQ.rtf
+++ b/macosx/docs/FAQ.rtf
@@ -1,68 +1,61 @@
-{\rtf1\ansi\ansicpg932\cocoartf1038\cocoasubrtf350
-{\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
+{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf600
+\cocoascreenfonts1{\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fnil\fcharset0 LucidaGrande-Bold;}
{\colortbl;\red255\green255\blue255;\red153\green102\blue51;\red0\green0\blue255;}
-\paperw11900\paperh16840\margl1440\margr1440\vieww11500\viewh12340\viewkind0
-\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+{\*\expandedcolortbl;;\csgenericrgb\c60000\c40000\c20000;\csgenericrgb\c0\c0\c100000;}
+\paperw11905\paperh16837\margl1440\margr1440\vieww11500\viewh12340\viewkind0
+\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\partightenfactor0
\f0\fs24 \cf0 \
-\b\fs28 FAQ for Mac port
-\b0\fs24 \
+\f1\b\fs28 FAQ for Mac port
+\f0\b0\fs24 \
\
\
-\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\partightenfactor0
-\b\fs26 \cf2 Differences and similarities among the Mac port and other ports
-\b0\fs24 \cf0 \
-\
-\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
-\cf3 Key mapping\cf0 \
- The default settings of key mapping are different. For example, the A-button is the command key on Mac, while it's the D key in Windows.\
+\f1\b\fs26 \cf2 Differences and similarities among the Mac port and other ports
+\f0\b0\fs24 \cf0 \
\
+\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\partightenfactor0
\cf3 User interface\cf0 \
All of the menus and dialogs are different.\
\
-\cf3 AVI or QuickTime export\cf0 \
- Mac port supports QuickTime export instead of AVI export in Windows port.\
-\
-\cf3 Sound effect and Core Image filter\cf0 \
- These features are for Mac only because they use Mac OS X's own technologies.\
-\
-\cf3 Netplay\cf0 \
- Snes9x's netplay is incompatible between ports.\
-\
-\cf3 Command-line options\cf0 \
- Mac port doesn't support command-line options.\
-\
\cf3 Preferences file\cf0 \
Mac port doesn't support 'snes9x.conf' file.\
\
\
-\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\partightenfactor0
-\b\fs26 \cf2 Emulator Specific Questions
-\b0\fs24 \cf0 \
+\f1\b\fs26 \cf2 Emulator Specific Questions
+\f0\b0\fs24 \cf0 \
\
-\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\partightenfactor0
\cf3 Everything is fine when I play the game, but the next time I play, my save data is not there. Why?\cf0 \
Saving files into a locked volume and folders where you don't have permission to write will fail. Make sure where you are saving files in 'Preferences' dialog. The most common case for Mac beginners is launching Snes9x directly from the disk image with choosing 'Snes9x folder' for saving destination.\
\
+\cf3 Where did Cheats/Movie Recording/Netplay/most of the preferences go?\
+\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\partightenfactor0
+\cf0 Snes9x is currently being ported from Carbon to Cocoa in order to work with macOS Catalina. Because this process is time-consuming, features are being added back over time. If there\'92s a specific feature you\'92d like to see return before others, please upvote an issue, or create one if none exists, at {\field{\*\fldinst{HYPERLINK "https://github.com/snes9xgit/snes9x/issues"}}{\fldrslt https://github.com/snes9xgit/snes9x/issues}}.\
+\
+\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\partightenfactor0
+\cf3 Why did my keyboard controls change when I upgraded?\
+\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\partightenfactor0
+\cf0 The Cocoa port of Snes9x \
+\
+\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\partightenfactor0
\cf3 Why can't I press many buttons at once? Especially in Chrono Trigger.\cf0 \
Some keyboards can only output two pressed keys at a time, except for modifier keys (shift, command, option and control). Set modifier keys to some of the necessary buttons.\
\
-\cf3 How can I enter the Game Genie / PAR code in 'Cheat Entry' dialog?\cf0 \
- Simply enter the code directly into the address column. Snes9x automatically translates it to the general format.\
-\
\cf3 I recently purchased a gamepad controller. Will it work on Snes9x?\
-\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\partightenfactor0
\cf0 If your gamepad is conformable to USB Device Class Definition for Human Interface Devices, it may work. Note that most gamepads don't officially support Mac OS X even if they work without problems.\cf3 \
\
I connected my gamepad but it doesn't work.\cf0 \
Gamepads cannot be used until you configure its settings in 'Configure Controllers' dialog.\
\
-\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\partightenfactor0
\cf3 I think my options in Snes9x got screwed up, how do I reset them?\cf0 \
- Quit Snes9x and trash the preferences file 'com.snes9x.macos.snes9x.plist' in ~/Library/Preferences.\
+ Quit Snes9x and trash the preferences files 'com.snes9x.macos.snes9x.plist' in ~/Library/Preferences and in /Library/Preferences. You may need to reboot afterwords. Alternately, you can use the command \'91defaults delete com.snes9x.macos.snes9x\'92 in Terminal.app to avoid restarting.\
\
\cf3 I had a bad checksummed game that didn't work so I adjusted the header, but it still doesn't work :( Why?\cf0 \
It should be noted that while it is possible to plop a ROM into Snestool, or several other programs, and adjust the header size to be the same as a proper 'good checksum' ROM, this merely mimics the appearance of a good ROM. Any problems still found within its evil will remain. One could compare it to covering up a circumorbital haematoma with a paper bag.\
@@ -74,12 +67,12 @@ I connected my gamepad but it doesn't work.\cf0 \
Chances are it will be coming out when enough changes have been made to suitably make a release. You can generally guesstimate the release date by paying attention to the Developers forum at snes9x.com. But don't ask them when the next release will be.\
\
\
-\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\partightenfactor0
-\b\fs26 \cf2 Miscellaneous Questions
-\b0\fs24 \cf0 \
+\f1\b\fs26 \cf2 Miscellaneous Questions
+\f0\b0\fs24 \cf0 \
\
-\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+\pard\tx285\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\partightenfactor0
\cf3 Is it legal?\cf0 \
This has been asked time and again, and the answer is yes. Developing, downloading, or using the emulator, Snes9x, is completely legal. Downloading games, called ROMS, however is not. If you own the original cartridge of a game, you are still not entitled to download the ROM image of that game. You may create a single backup image of your own cartridge via proper hardware, but it must be YOUR cartridge and is only usable in place of the original... so only one may be active at any time. Many sites claim that you may legally download ROMs for up to 24 hours before they must be deleted. This is also wrong; you can't legally download these for "trial" purposes. You can't download ROMs for educational purposes either. If you wish to use Super Nintendo Entertainment System games for educational purposes, contact your closest Nintendo Outlet and discuss educational programming with them. Finally, a small number of ROMs are labeled "(PD)". This means public domain, and these games are not under copyright. As such they are legal to download at your hearts content. These include programs created by internet users such as yourself for use in Super Nintendo emulators. As of this time there are no commercial videogames in the public domain.\
\
diff --git a/macosx/en.lproj/Snes9x Help/pgs/01.html b/macosx/en.lproj/Snes9x Help/pgs/01.html
index c0eb0bed..98e5bb98 100644
--- a/macosx/en.lproj/Snes9x Help/pgs/01.html
+++ b/macosx/en.lproj/Snes9x Help/pgs/01.html
@@ -30,11 +30,10 @@
As with all things there are disadvantages though :
- - if you have an ancient computer, you aren't likely to get a playable experience.
- some games are still unemulated (though this a very tiny minority.)
- the emulator can be difficult for new users to configure.
-
Getting Started
- Copy the Snes9x application from the disk image (.dmg) to your hard disk and double-click it.
+ Copy the Snes9x application to your hard Applications Folder and double-click it.
Loading Games
@@ -64,7 +64,7 @@
SNES Joypad Emulation
- The default key mapping for joypad 1 is as follows:
+ The Mac port now uses the same default key mapping as the Windows port. The default key mapping for joypad 1 is as follows:
@@ -86,35 +86,35 @@
Right direction |
- command |
+ V |
A button |
- option |
+ C |
B button |
- control |
+ D |
X button |
- shift |
+ X |
Y button |
- Z |
+ A |
L button |
- X |
+ S |
R button |
- tab |
+ return |
Select button |
- return |
+ space |
Start button |
@@ -122,9 +122,9 @@
Pausing and Resuming the Game
- To pause the game, press pause key (esc key by default), choose 'Pause' in 'Emulation' menu, or click the game screen in case you aren't playing the game that uses a mouse. Double-click the game window or choose 'Resume' in 'Emulation' menu to resume the game.
+ To pause the game, press pause key (esc key by default) or choose 'Pause' in 'Emulation' menu. Choose 'Resume' in 'Emulation' menu to resume the game.
-