Merge pull request #1536 from GriffinRichards/clean-braille

Add font id constants, better braille support

5 files changed, 28 insertions, 76 deletions

diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc
index 40d9f0dff..edbb75ccc 100644
--- a/data/maps/AncientTomb/scripts.inc
+++ b/data/maps/AncientTomb/scripts.inc
@@ -40,9 +40,7 @@ AncientTomb_EventScript_HideRegiEntrance::
 AncientTomb_EventScript_CaveEntranceMiddle::
 	lockall
 	goto_if_set FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_BigHoleInWall
-	braillemessage AncientTomb_Braille_ShineInTheMiddle
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox AncientTomb_Braille_ShineInTheMiddle
 	releaseall
 	end
 
@@ -53,9 +51,7 @@ AncientTomb_EventScript_BigHoleInWall::
 
 AncientTomb_EventScript_CaveEntranceSide::
 	lockall
-	braillemessage AncientTomb_Braille_ShineInTheMiddle
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox AncientTomb_Braille_ShineInTheMiddle
 	releaseall
 	end
 
diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc
index 414dbfc57..1bcaa23bf 100644
--- a/data/maps/DesertRuins/scripts.inc
+++ b/data/maps/DesertRuins/scripts.inc
@@ -40,9 +40,7 @@ DesertRuins_EventScript_ShowRegirock::
 DesertRuins_EventScript_CaveEntranceMiddle::
 	lockall
 	goto_if_set FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_BigHoleInWall
-	braillemessage DesertRuins_Braille_UseRockSmash
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox DesertRuins_Braille_UseRockSmash
 	releaseall
 	end
 
@@ -53,9 +51,7 @@ DesertRuins_EventScript_BigHoleInWall::
 
 DesertRuins_EventScript_CaveEntranceSide::
 	lockall
-	braillemessage DesertRuins_Braille_UseRockSmash
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox DesertRuins_Braille_UseRockSmash
 	releaseall
 	end
 
diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc
index f81e5f9fd..7d240535c 100644
--- a/data/maps/SealedChamber_InnerRoom/scripts.inc
+++ b/data/maps/SealedChamber_InnerRoom/scripts.inc
@@ -3,27 +3,25 @@ SealedChamber_InnerRoom_MapScripts::
 
 SealedChamber_InnerRoom_EventScript_BrailleBackWall::
 	lockall
-	braillemessage SealedChamber_InnerRoom_Braille_FirstWailordLastRelicanth
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox SealedChamber_InnerRoom_Braille_FirstWailordLastRelicanth
 	goto_if_set FLAG_REGI_DOORS_OPENED, SealedChamber_InnerRoom_EventScript_NoEffect
 	specialvar VAR_RESULT, CheckRelicanthWailord
 	compare VAR_RESULT, FALSE
 	goto_if_eq SealedChamber_InnerRoom_EventScript_NoEffect
 	fadeoutbgm 0
 	playse SE_TRUCK_MOVE
-	special DoSealedChamberShakingEffect1
+	special DoSealedChamberShakingEffect_Long
 	waitstate
 	delay 40
-	special DoSealedChamberShakingEffect2
+	special DoSealedChamberShakingEffect_Short
 	waitstate
 	playse SE_DOOR
 	delay 40
-	special DoSealedChamberShakingEffect2
+	special DoSealedChamberShakingEffect_Short
 	waitstate
 	playse SE_DOOR
 	delay 40
-	special DoSealedChamberShakingEffect2
+	special DoSealedChamberShakingEffect_Short
 	waitstate
 	playse SE_DOOR
 	delay 40
@@ -40,49 +38,37 @@ SealedChamber_InnerRoom_EventScript_NoEffect::
 
 SealedChamber_InnerRoom_EventScript_BrailleStoryPart1::
 	lockall
-	braillemessage SealedChamber_InnerRoom_Braille_InThisCaveWeHaveLived
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox SealedChamber_InnerRoom_Braille_InThisCaveWeHaveLived
 	releaseall
 	end
 
 SealedChamber_InnerRoom_EventScript_BrailleStoryPart2::
 	lockall
-	braillemessage SealedChamber_InnerRoom_Braille_WeOweAllToThePokemon
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox SealedChamber_InnerRoom_Braille_WeOweAllToThePokemon
 	releaseall
 	end
 
 SealedChamber_InnerRoom_EventScript_BrailleStoryPart3::
 	lockall
-	braillemessage SealedChamber_InnerRoom_Braille_ButWeSealedThePokemonAway
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox SealedChamber_InnerRoom_Braille_ButWeSealedThePokemonAway
 	releaseall
 	end
 
 SealedChamber_InnerRoom_EventScript_BrailleStoryPart4::
 	lockall
-	braillemessage SealedChamber_InnerRoom_Braille_WeFearedIt
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox SealedChamber_InnerRoom_Braille_WeFearedIt
 	releaseall
 	end
 
 SealedChamber_InnerRoom_EventScript_BrailleStoryPart5::
 	lockall
-	braillemessage SealedChamber_InnerRoom_Braille_ThoseWithCourageHope
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox SealedChamber_InnerRoom_Braille_ThoseWithCourageHope
 	releaseall
 	end
 
 SealedChamber_InnerRoom_EventScript_BrailleStoryPart6::
 	lockall
-	braillemessage SealedChamber_InnerRoom_Braille_OpenDoorEternalPokemonWaits
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox SealedChamber_InnerRoom_Braille_OpenDoorEternalPokemonWaits
 	releaseall
 	end
 
diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc
index 2e80d06c8..7d57ea544 100644
--- a/data/maps/SealedChamber_OuterRoom/scripts.inc
+++ b/data/maps/SealedChamber_OuterRoom/scripts.inc
@@ -28,90 +28,68 @@ SealedChamber_OuterRoom_EventScript_CloseInnerRoomEntrance::
 
 SealedChamber_OuterRoom_EventScript_BrailleABC::
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_ABC
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox SealedChamber_OuterRoom_Braille_ABC
 	releaseall
 	end
 
 SealedChamber_OuterRoom_EventScript_BrailleGHI::
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_GHI
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox SealedChamber_OuterRoom_Braille_GHI
 	releaseall
 	end
 
 SealedChamber_OuterRoom_EventScript_BrailleMNO::
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_MNO
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox SealedChamber_OuterRoom_Braille_MNO
 	releaseall
 	end
 
 SealedChamber_OuterRoom_EventScript_BrailleTUV::
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_TUV
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox SealedChamber_OuterRoom_Braille_TUV
 	releaseall
 	end
 
 SealedChamber_OuterRoom_EventScript_BrailleDEF::
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_DEF
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox SealedChamber_OuterRoom_Braille_DEF
 	releaseall
 	end
 
 SealedChamber_OuterRoom_EventScript_BrailleJKL::
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_JKL
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox SealedChamber_OuterRoom_Braille_JKL
 	releaseall
 	end
 
 SealedChamber_OuterRoom_EventScript_BraillePQRS::
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_PQRS
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox SealedChamber_OuterRoom_Braille_PQRS
 	releaseall
 	end
 
 SealedChamber_OuterRoom_EventScript_BraillePeriod::
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_Period
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox SealedChamber_OuterRoom_Braille_Period
 	releaseall
 	end
 
 SealedChamber_OuterRoom_EventScript_BrailleWXYZ::
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_WXYZ
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox SealedChamber_OuterRoom_Braille_WXYZ
 	releaseall
 	end
 
 SealedChamber_OuterRoom_EventScript_BrailleComma::
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_Comma
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox SealedChamber_OuterRoom_Braille_Comma
 	releaseall
 	end
 
 SealedChamber_OuterRoom_EventScript_InnerRoomEntranceWall::
 	lockall
 	goto_if_set FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_HoleInWall
-	braillemessage SealedChamber_OuterRoom_Braille_DigHere
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox SealedChamber_OuterRoom_Braille_DigHere
 	releaseall
 	end
 
@@ -122,9 +100,7 @@ SealedChamber_OuterRoom_EventScript_HoleInWall::
 
 SealedChamber_OuterRoom_EventScript_BrailleDigHere::
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_DigHere
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox SealedChamber_OuterRoom_Braille_DigHere
 	releaseall
 	end
 
diff --git a/data/maps/Underwater_SealedChamber/scripts.inc b/data/maps/Underwater_SealedChamber/scripts.inc
index 3d8aaf979..2b3fe5e0d 100644
--- a/data/maps/Underwater_SealedChamber/scripts.inc
+++ b/data/maps/Underwater_SealedChamber/scripts.inc
@@ -20,9 +20,7 @@ Underwater_SealedChamber_EventScript_SurfaceSealedChamber::
 
 Underwater_SealedChamber_EventScript_Braille::
 	lockall
-	braillemessage Underwater_SealedChamber_Braille_GoUpHere
-	waitbuttonpress
-	closebraillemessage
+	braillemsgbox Underwater_SealedChamber_Braille_GoUpHere
 	releaseall
 	end