Merge branch 'master' into doc-cinnabar

2 files changed, 46 insertions, 46 deletions

diff --git a/data/maps/MtEmber_RubyPath_B4F/map.json b/data/maps/MtEmber_RubyPath_B4F/map.json
index 42d8ee7f2..23b6556f6 100644
--- a/data/maps/MtEmber_RubyPath_B4F/map.json
+++ b/data/maps/MtEmber_RubyPath_B4F/map.json
@@ -36,182 +36,182 @@
       "x": 3,
       "y": 7,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_1638EC"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BrailleABC"
     },
     {
       "type": "bg_event_type_1",
       "x": 4,
       "y": 7,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_1638EC"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BrailleABC"
     },
     {
       "type": "bg_event_type_1",
       "x": 5,
       "y": 7,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_1638EC"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BrailleABC"
     },
     {
       "type": "bg_event_type_1",
       "x": 4,
       "y": 9,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_1638F5"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BrailleGHI"
     },
     {
       "type": "bg_event_type_1",
       "x": 3,
       "y": 9,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_1638F5"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BrailleGHI"
     },
     {
       "type": "bg_event_type_1",
       "x": 5,
       "y": 9,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_1638F5"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BrailleGHI"
     },
     {
       "type": "bg_event_type_1",
       "x": 3,
       "y": 11,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_1638FE"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BrailleMNO"
     },
     {
       "type": "bg_event_type_1",
       "x": 4,
       "y": 11,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_1638FE"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BrailleMNO"
     },
     {
       "type": "bg_event_type_1",
       "x": 5,
       "y": 11,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_1638FE"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BrailleMNO"
     },
     {
       "type": "bg_event_type_1",
       "x": 3,
       "y": 13,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_163907"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BrailleTUV"
     },
     {
       "type": "bg_event_type_1",
       "x": 4,
       "y": 13,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_163907"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BrailleTUV"
     },
     {
       "type": "bg_event_type_1",
       "x": 5,
       "y": 13,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_163907"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BrailleTUV"
     },
     {
       "type": "bg_event_type_1",
       "x": 7,
       "y": 7,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_163910"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BrailleDEF"
     },
     {
       "type": "bg_event_type_1",
       "x": 8,
       "y": 7,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_163910"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BrailleDEF"
     },
     {
       "type": "bg_event_type_1",
       "x": 9,
       "y": 7,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_163910"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BrailleDEF"
     },
     {
       "type": "bg_event_type_1",
       "x": 7,
       "y": 9,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_163919"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BrailleJKL"
     },
     {
       "type": "bg_event_type_1",
       "x": 8,
       "y": 9,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_163919"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BrailleJKL"
     },
     {
       "type": "bg_event_type_1",
       "x": 9,
       "y": 9,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_163919"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BrailleJKL"
     },
     {
       "type": "bg_event_type_1",
       "x": 7,
       "y": 11,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_163922"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BraillePQRS"
     },
     {
       "type": "bg_event_type_1",
       "x": 11,
       "y": 7,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_163934"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BraillePeriod"
     },
     {
       "type": "bg_event_type_1",
       "x": 11,
       "y": 9,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_16393D"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BrailleComma"
     },
     {
       "type": "bg_event_type_1",
       "x": 8,
       "y": 11,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_163922"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BraillePQRS"
     },
     {
       "type": "bg_event_type_1",
       "x": 9,
       "y": 11,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_163922"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BraillePQRS"
     },
     {
       "type": "bg_event_type_1",
       "x": 7,
       "y": 13,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_16392B"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BrailleWXYZ"
     },
     {
       "type": "bg_event_type_1",
       "x": 9,
       "y": 13,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_16392B"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BrailleWXYZ"
     },
     {
       "type": "bg_event_type_1",
       "x": 8,
       "y": 13,
       "elevation": 0,
-      "script": "MtEmber_RubyPath_B4F_EventScript_16392B"
+      "script": "MtEmber_RubyPath_B4F_EventScript_BrailleWXYZ"
     }
   ]
 }
diff --git a/data/maps/MtEmber_RubyPath_B4F/scripts.inc b/data/maps/MtEmber_RubyPath_B4F/scripts.inc
index 18249a49a..b66185733 100644
--- a/data/maps/MtEmber_RubyPath_B4F/scripts.inc
+++ b/data/maps/MtEmber_RubyPath_B4F/scripts.inc
@@ -1,72 +1,72 @@
 MtEmber_RubyPath_B4F_MapScripts:: @ 81638EB
 	.byte 0
 
-MtEmber_RubyPath_B4F_EventScript_1638EC:: @ 81638EC
+MtEmber_RubyPath_B4F_EventScript_BrailleABC:: @ 81638EC
 	lockall
-	braillemessage gUnknown_81A929F
+	braillemessage Braille_Text_ABC
 	waitbuttonpress
 	releaseall
 	end
 
-MtEmber_RubyPath_B4F_EventScript_1638F5:: @ 81638F5
+MtEmber_RubyPath_B4F_EventScript_BrailleGHI:: @ 81638F5
 	lockall
-	braillemessage gUnknown_81A92A3
+	braillemessage Braille_Text_GHI
 	waitbuttonpress
 	releaseall
 	end
 
-MtEmber_RubyPath_B4F_EventScript_1638FE:: @ 81638FE
+MtEmber_RubyPath_B4F_EventScript_BrailleMNO:: @ 81638FE
 	lockall
-	braillemessage gUnknown_81A92A7
+	braillemessage Braille_Text_MNO
 	waitbuttonpress
 	releaseall
 	end
 
-MtEmber_RubyPath_B4F_EventScript_163907:: @ 8163907
+MtEmber_RubyPath_B4F_EventScript_BrailleTUV:: @ 8163907
 	lockall
-	braillemessage gUnknown_81A92AB
+	braillemessage Braille_Text_TUV
 	waitbuttonpress
 	releaseall
 	end
 
-MtEmber_RubyPath_B4F_EventScript_163910:: @ 8163910
+MtEmber_RubyPath_B4F_EventScript_BrailleDEF:: @ 8163910
 	lockall
-	braillemessage gUnknown_81A92AF
+	braillemessage Braille_Text_DEF
 	waitbuttonpress
 	releaseall
 	end
 
-MtEmber_RubyPath_B4F_EventScript_163919:: @ 8163919
+MtEmber_RubyPath_B4F_EventScript_BrailleJKL:: @ 8163919
 	lockall
-	braillemessage gUnknown_81A92B3
+	braillemessage Braille_Text_JKL
 	waitbuttonpress
 	releaseall
 	end
 
-MtEmber_RubyPath_B4F_EventScript_163922:: @ 8163922
+MtEmber_RubyPath_B4F_EventScript_BraillePQRS:: @ 8163922
 	lockall
-	braillemessage gUnknown_81A92B7
+	braillemessage Braille_Text_PQRS
 	waitbuttonpress
 	releaseall
 	end
 
-MtEmber_RubyPath_B4F_EventScript_16392B:: @ 816392B
+MtEmber_RubyPath_B4F_EventScript_BrailleWXYZ:: @ 816392B
 	lockall
-	braillemessage gUnknown_81A92BC
+	braillemessage Braille_Text_WXYZ
 	waitbuttonpress
 	releaseall
 	end
 
-MtEmber_RubyPath_B4F_EventScript_163934:: @ 8163934
+MtEmber_RubyPath_B4F_EventScript_BraillePeriod:: @ 8163934
 	lockall
-	braillemessage gUnknown_81A92C1
+	braillemessage Braille_Text_Period
 	waitbuttonpress
 	releaseall
 	end
 
-MtEmber_RubyPath_B4F_EventScript_16393D:: @ 816393D
+MtEmber_RubyPath_B4F_EventScript_BrailleComma:: @ 816393D
 	lockall
-	braillemessage gUnknown_81A92C3
+	braillemessage Braille_Text_Comma
 	waitbuttonpress
 	releaseall
 	end