diff --git a/osx/Scenario Editor/Blades of Exile Graphics b/osx/Scenario Editor/Blades of Exile Graphics
index 66e3274e..eabe7399 100644
Binary files a/osx/Scenario Editor/Blades of Exile Graphics and b/osx/Scenario Editor/Blades of Exile Graphics differ
diff --git a/osx/Scenario Editor/Editor.xcodeproj/project.pbxproj b/osx/Scenario Editor/Editor.xcodeproj/project.pbxproj
index 29603cde..3f93edc1 100644
--- a/osx/Scenario Editor/Editor.xcodeproj/project.pbxproj	
+++ b/osx/Scenario Editor/Editor.xcodeproj/project.pbxproj	
@@ -71,6 +71,7 @@
 		2BDBD34F0C0A232300A0A01D /* tGraphics.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = tGraphics.h; sourceTree = "<group>"; };
 		2BDBD3500C0A232300A0A01D /* townout.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = townout.c; sourceTree = "<group>"; };
 		2BDBD3510C0A232300A0A01D /* townout.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = townout.h; sourceTree = "<group>"; };
+		91B3EDA10F9666BC00BF5B67 /* ViewDlog-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "ViewDlog-Info.plist"; sourceTree = "<group>"; };
 		91D636080F90E9AB00674AB3 /* BOEScen.rsrc */ = {isa = PBXFileReference; lastKnownFileType = archive.rsrc; path = BOEScen.rsrc; sourceTree = "<group>"; };
 		91D6360A0F90EA5000674AB3 /* BoE Scenario Editor.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "BoE Scenario Editor.icns"; sourceTree = "<group>"; };
 		91D6360C0F90EA7500674AB3 /* Blades of Exile Sounds */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Blades of Exile Sounds"; sourceTree = "<group>"; };
@@ -99,6 +100,7 @@
 				91D636030F90E95F00674AB3 /* headers */,
 				91D636000F90E94100674AB3 /* src */,
 				2BDBD32D0C0A22DE00A0A01D /* Products */,
+				91B3EDA10F9666BC00BF5B67 /* ViewDlog-Info.plist */,
 			);
 			sourceTree = "<group>";
 		};
diff --git a/osx/Scenario Editor/global.h b/osx/Scenario Editor/global.h
index df5ec5f7..7e0e90a0 100644
--- a/osx/Scenario Editor/global.h	
+++ b/osx/Scenario Editor/global.h	
@@ -32,28 +32,47 @@
 #define	CDST	cd_set_text_edit_str
 #define	CDSN	cd_set_text_edit_num
 
+// These constants are for draw_dialog_graphic() to know where to find the graphic.
 #define PICT_OLD_TYPE			-1
 #define PICT_BLANK_TYPE			0
-#define PICT_TER_TYPE			1
+#define PICT_TER_TYPE			1 // 28x36 terrain graphic
 #define PICT_TER_ANIM_TYPE		2
 #define PICT_MONST_TYPE			3
-#define PICT_DLG_TYPE			4
-#define PICT_TALK_TYPE			5
-#define PICT_SCEN_TYPE			6
-#define PICT_ITEM_TYPE			7
-#define DLG_NEW_PICTURE			20   // This is added to various of the above constants
-#define PICT_CUSTOM_TYPE		100  // This is added to various of the above constants
-#define PICT_N_TER				336
-#define PICT_N_TER_ANIM			18
+#define PICT_DLG_TYPE			4 // 36x36 dialog graphic
+#define PICT_TALK_TYPE			5 // 32x32 facial graphic
+#define PICT_SCEN_TYPE			6 // 32x32 scenario icon
+#define PICT_ITEM_TYPE			7 // Item graphic (two sizes available)
+/* The following four are modifiers to be added to the above seven constants
+ * Usage for PICT_CUSTOM_TYPE:
+ * PICT_CUSTOM_TYPE + PICT_XXX_TYPE, where XXX is anything valid other than OLD or BLANK.
+ * PICT_CUSTOM_TYPE + PICT_MONST_TYPE + PICT_WIDE_MONST, for a 2x1 monster
+ * PICT_CUSTOM_TYPE + PICT_MONST_TYPE + PICT_TALL_MONST, for a 1x2 monster
+ * PICT_CUSTOM_TYPE + PICT_MONST_TYPE + PICT_TALL_MONST + PICT_WIDE_MONST, for a 2x2 monster
+ * Notes:
+ *  - PICT_TALL_MONST and PICT_WIDE_MONST only apply to custom monsters - the preset
+ * monster graphics have these settings hardcoded.
+ *  - Also note that custom scenario graphics are not currently supported. This doesn't really
+ * matter, though, since if they were they'd be handled like talk (facial) graphics.
+ *  - Custom animated terrain graphics should use PICT_TER_TYPE rather than PICT_TER_ANIM_TYPE.
+ */
+#define PICT_CUSTOM_TYPE		100
+#define PICT_WIDE_MONSTER		10
+#define PICT_TALL_MONSTER		20
+#define DLG_NEW_PICTURE			20 // Adding this one makes it a DLG_ constant rather than a PICT_ constant
+// These constants are the total number of preset graphics of each type.
+#define PICT_N_TER				252 // 336
+#define PICT_N_TER_ANIM			13 // 18
 #define PICT_N_MONST			172
-#define PICT_N_DLG				36
+#define PICT_N_DLG				35 // 36
 #define PICT_N_TALK				83
 #define PICT_N_SCEN				29
 #define PICT_N_ITEM				122
 
+// These constants are used to create the definition of the dialogs, and
+// to parse a dialog resource when displaying it to the screen.
 #define DLG_BUTTON_TYPE				0
 #define DLG_DEFAULT_BTN_TYPE		1
-// Not sure what 10 and 11 do, but they're similar to above two
+// Not sure what 10 and 11 do, but they may be similar to above two
 #define DLG_LED_BUTTON				2
 // 3, 4, 7, 8, 9 are various text objects; not completely sure which is which
 #define DLG_TEXT_BOLD				3