diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index ae108f142..f98ef3b41 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -1666,7 +1666,7 @@ gUnknown_081C6C02:: @ 81C6C02 @ 81C6C1D lockall - braillemessage Underwater_SealedChamber_Braille_1C533D + braillemessage Underwater_SealedChamber_Braille_GoUpHere waitbuttonpress erasebox 0, 0, 29, 19 releaseall diff --git a/data-de/text/braille.inc b/data-de/text/braille.inc index 071657502..e3b34f295 100644 --- a/data-de/text/braille.inc +++ b/data-de/text/braille.inc @@ -1,67 +1,67 @@ -Underwater_SealedChamber_Braille_1C533D:: @ 81C533D +Underwater_SealedChamber_Braille_GoUpHere:: @ 81C533D .string "ÀÉëÒÂÌÒÉÌë ÒÉéÀ{0x31}Ê{0x3F}Œ$" -SealedChamber_OuterRoom_Braille_1C534F:: @ 81C534F +SealedChamber_OuterRoom_Braille_ABC:: @ 81C534F .string "ÊÉßÒÎÌÀÈÂÎ$" -SealedChamber_OuterRoom_Braille_1C5359:: @ 81C5359 +SealedChamber_OuterRoom_Braille_GHI:: @ 81C5359 .string "ÊÉßÒÎÌÉÓÙß$" -SealedChamber_OuterRoom_Braille_1C5363:: @ 81C5363 +SealedChamber_OuterRoom_Braille_MNO:: @ 81C5363 .string "ÊÉßÒÎÌ{0x1F}ëàì$" -SealedChamber_OuterRoom_Braille_1C536D:: @ 81C536D +SealedChamber_OuterRoom_Braille_TUV:: @ 81C536D .string "ÌÉÛÒÒÌ{0x3B}{0x39}$" -SealedChamber_OuterRoom_Braille_1C5377:: @ 81C5377 +SealedChamber_OuterRoom_Braille_DEF:: @ 81C5377 .string "ÊÉßÒÎÌÌÊÔÒ$" -SealedChamber_OuterRoom_Braille_1C5381:: @ 81C5381 +SealedChamber_OuterRoom_Braille_JKL:: @ 81C5381 .string "ÊÉßÒÎÌÛéçá$" -SealedChamber_OuterRoom_Braille_1C538B:: @ 81C538B +SealedChamber_OuterRoom_Braille_PQRS:: @ 81C538B .string "ÊÉßÒÎÌ{0x31}=+{0x33}$" -SealedChamber_OuterRoom_Braille_1C5396:: @ 81C5396 +SealedChamber_OuterRoom_Braille_Period:: @ 81C5396 .string "ÌÉÛÒÒÌ{0x3F}Œ$" -SealedChamber_OuterRoom_Braille_1C539E:: @ 81C539E +SealedChamber_OuterRoom_Braille_WXYZ:: @ 81C539E .string "ËÉÑÒÏÌèù&$" -SealedChamber_OuterRoom_Braille_1C53A9:: @ 81C53A9 +SealedChamber_OuterRoom_Braille_Comma:: @ 81C53A9 .string "ÌÉÛÒÒÌ{0x3F}Ç$" -SealedChamber_OuterRoom_Braille_1C53B1:: @ 81C53B1 +SealedChamber_OuterRoom_Braille_DigHere:: @ 81C53B1 .string "ÉÇ{0x18}ÔËÊàÂÒÀ{0x31}ÊßÌ\n" .string "ÒÉÌë{0x3F}Œ$" -SealedChamber_InnerRoom_Braille_1C53C1:: @ 81C53C1 +SealedChamber_InnerRoom_Braille_FirstRelicanthLastWailord:: @ 81C53C1 .string "È çÛÊÂëÌßÉÂÀéìÒ\n" .string "{0x39}{0x31}Ìëàì{0x3F}Ç\n" .string "+ÀÉßçëÎ\n" .string "{0x39}{0x31}ßÌì{0x39}ì{0x3F}Œ$" -SealedChamber_InnerRoom_Braille_1C53F2:: @ 81C53F2 +SealedChamber_InnerRoom_Braille_InThisCaveWeHaveLived:: @ 81C53F2 .string "ÁÁêÙÇÈÉé ÎÉÌàÌë\n" .string "ÒùÒßÌ ÒÀÈÌé\n" .string "+Éë ÔÌßÌÈì{0x3F}Œ$" -SealedChamber_InnerRoom_Braille_1C5414:: @ 81C5414 +SealedChamber_InnerRoom_Braille_WeOweAllToThePokemon:: @ 81C5414 .string "ÀÁëÙÂÈ+Éë =ÌëÎÀéÙÌé\n" .string "ÀßßÌà ÎÌé\n" .string "áçÙÌÛçé{0x3F}Ç$" -SealedChamber_InnerRoom_Braille_1C5435:: @ 81C5435 +SealedChamber_InnerRoom_Braille_ButWeSealedThePokemonAway:: @ 81C5435 .string "Á êÛÇÂÎÌééçÂÒ\n" .string "àáÌëëìÌé +Éë\n" .string "ÎÉÌ áçÙÌÛçé\n" .string "+ÌÔ{0x3F}Œ$" -SealedChamber_InnerRoom_Braille_1C545C:: @ 81C545C +SealedChamber_InnerRoom_Braille_WeFearedIt:: @ 81C545C .string "ÇÇèÔÉÊ+Éë ÒÀììÌé\n" .string "ÀéÔàì{0x3F}Œ$" -SealedChamber_InnerRoom_Braille_1C5470:: @ 81C5470 +SealedChamber_InnerRoom_Braille_ThoseWithCourageHope:: @ 81C5470 .string " ëÛÀÂÎÌéÓÌéÉÔÌé{0x3F}Ç\n" .string "ÎÉÌ ÒçÊÊÌé {0x31}éÎ\n" .string "Û{0x31}ìÉÔ àÉéÎ{0x3F}Ç\n" @@ -73,19 +73,19 @@ SealedChamber_InnerRoom_Braille_1C549B:: @ 81C549B .string "áçÙÌÛçé\n" .string "ùÊÊéÌé{0x3F}Œ$" -DesertRuins_Braille_1C54C8:: @ 81C54C8 +DesertRuins_Braille_UseStrength:: @ 81C54C8 .string " ëÛÀÂ{0x39}+ÌÉÛÀß ëÌÂÒìà\n" .string "{0x31}éÎ {0x39}+ÌÉ\n" .string "ÒÉé{0x31}éìÌë{0x3F}Ç\n" .string "ÎÀéé àìèëÙÌ{0x3F}Œ$" -IslandCave_Braille_1C54FC:: @ 81C54FC +IslandCave_Braille_WaitTwoMinutes:: @ 81C54FC .string " éÛÈÂ+ÀëìÌ{0x3F}Ç ÈÉà\n" .string "ÎÉÌ {0x39}ÌÉì\n" .string "{0x39}+ÌÉÛÀß\n" .string "Î{0x31}ëÂÒ Éàì{0x3F}Œ$" -AncientTomb_Braille_1C552E:: @ 81C552E +AncientTomb_Braille_AimToTheSkyInTheMiddle:: @ 81C552E .string " ëÛÀÂéÌ{0x31}Ì {0x39}ÌÉì{0x3F}Ç\n" .string "ÒçÊÊé{0x31}éÔ {0x31}éÎ\n" .string "ßÉÌÈÌ àÉéÎ ÎÉÌ\n" diff --git a/data/event_scripts.s b/data/event_scripts.s index e57c39b2e..67223b7d5 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1656,7 +1656,7 @@ gUnknown_081C6C02:: @ 81C6C02 @ 81C6C1D lockall - braillemessage Underwater_SealedChamber_Braille_1C533D + braillemessage Underwater_SealedChamber_Braille_GoUpHere waitbuttonpress erasebox 0, 0, 29, 19 releaseall diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index a40e856be..f27eeafbe 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -32,7 +32,7 @@ AncientTomb_EventScript_15EFEA:: @ 815EFEA AncientTomb_EventScript_15F021:: @ 815F021 lockall goto_if_set FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_15F038 - braillemessage AncientTomb_Braille_1C552E + braillemessage AncientTomb_Braille_AimToTheSkyInTheMiddle waitbuttonpress erasebox 0, 0, 29, 19 releaseall @@ -45,7 +45,7 @@ AncientTomb_EventScript_15F038:: @ 815F038 AncientTomb_EventScript_15F042:: @ 815F042 lockall - braillemessage AncientTomb_Braille_1C552E + braillemessage AncientTomb_Braille_AimToTheSkyInTheMiddle waitbuttonpress erasebox 0, 0, 29, 19 releaseall diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index cfd5d115a..41c4c2d33 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -32,7 +32,7 @@ DesertRuins_MapScript1_15CB52:: @ 815CB52 DesertRuins_EventScript_15CB56:: @ 815CB56 lockall goto_if_set FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_15CB6D - braillemessage DesertRuins_Braille_1C54C8 + braillemessage DesertRuins_Braille_UseStrength waitbuttonpress erasebox 0, 0, 29, 19 releaseall @@ -45,7 +45,7 @@ DesertRuins_EventScript_15CB6D:: @ 815CB6D DesertRuins_EventScript_15CB77:: @ 815CB77 lockall - braillemessage DesertRuins_Braille_1C54C8 + braillemessage DesertRuins_Braille_UseStrength waitbuttonpress erasebox 0, 0, 29, 19 releaseall diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index ad7895bf8..ce8add75e 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -44,7 +44,7 @@ S_OpenRegiceChamber:: @ 815EF19 IslandCave_EventScript_15EF59:: @ 815EF59 lockall goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EF72 - braillemessage IslandCave_Braille_1C54FC + braillemessage IslandCave_Braille_WaitTwoMinutes special DoBrailleWait waitstate goto IslandCave_EventScript_15EF95 @@ -57,7 +57,7 @@ IslandCave_EventScript_15EF72:: @ 815EF72 IslandCave_EventScript_15EF7C:: @ 815EF7C lockall - braillemessage IslandCave_Braille_1C54FC + braillemessage IslandCave_Braille_WaitTwoMinutes goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EF95 special DoBrailleWait waitstate diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc index a5355b77a..cac1b9d71 100644 --- a/data/maps/SealedChamber_InnerRoom/scripts.inc +++ b/data/maps/SealedChamber_InnerRoom/scripts.inc @@ -3,7 +3,7 @@ SealedChamber_InnerRoom_MapScripts:: @ 815F1E7 SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 lockall - braillemessage SealedChamber_InnerRoom_Braille_1C53C1 + braillemessage SealedChamber_InnerRoom_Braille_FirstRelicanthLastWailord waitbuttonpress erasebox 0, 0, 29, 19 goto_if_set FLAG_REGI_DOORS_OPENED, SealedChamber_InnerRoom_EventScript_15F247 @@ -40,7 +40,7 @@ SealedChamber_InnerRoom_EventScript_15F247:: @ 815F247 SealedChamber_InnerRoom_EventScript_15F249:: @ 815F249 lockall - braillemessage SealedChamber_InnerRoom_Braille_1C53F2 + braillemessage SealedChamber_InnerRoom_Braille_InThisCaveWeHaveLived waitbuttonpress erasebox 0, 0, 29, 19 releaseall @@ -48,7 +48,7 @@ SealedChamber_InnerRoom_EventScript_15F249:: @ 815F249 SealedChamber_InnerRoom_EventScript_15F257:: @ 815F257 lockall - braillemessage SealedChamber_InnerRoom_Braille_1C5414 + braillemessage SealedChamber_InnerRoom_Braille_WeOweAllToThePokemon waitbuttonpress erasebox 0, 0, 29, 19 releaseall @@ -56,7 +56,7 @@ SealedChamber_InnerRoom_EventScript_15F257:: @ 815F257 SealedChamber_InnerRoom_EventScript_15F265:: @ 815F265 lockall - braillemessage SealedChamber_InnerRoom_Braille_1C5435 + braillemessage SealedChamber_InnerRoom_Braille_ButWeSealedThePokemonAway waitbuttonpress erasebox 0, 0, 29, 19 releaseall @@ -64,7 +64,7 @@ SealedChamber_InnerRoom_EventScript_15F265:: @ 815F265 SealedChamber_InnerRoom_EventScript_15F273:: @ 815F273 lockall - braillemessage SealedChamber_InnerRoom_Braille_1C545C + braillemessage SealedChamber_InnerRoom_Braille_WeFearedIt waitbuttonpress erasebox 0, 0, 29, 19 releaseall @@ -72,7 +72,7 @@ SealedChamber_InnerRoom_EventScript_15F273:: @ 815F273 SealedChamber_InnerRoom_EventScript_15F281:: @ 815F281 lockall - braillemessage SealedChamber_InnerRoom_Braille_1C5470 + braillemessage SealedChamber_InnerRoom_Braille_ThoseWithCourageHope waitbuttonpress erasebox 0, 0, 29, 19 releaseall diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc index fd067cea9..fb662b3a1 100644 --- a/data/maps/SealedChamber_OuterRoom/scripts.inc +++ b/data/maps/SealedChamber_OuterRoom/scripts.inc @@ -28,7 +28,7 @@ SealedChamber_OuterRoom_EventScript_15F0F5:: @ 815F0F5 SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C lockall - braillemessage SealedChamber_OuterRoom_Braille_1C534F + braillemessage SealedChamber_OuterRoom_Braille_ABC waitbuttonpress erasebox 0, 0, 29, 19 releaseall @@ -36,7 +36,7 @@ SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C SealedChamber_OuterRoom_EventScript_15F13A:: @ 815F13A lockall - braillemessage SealedChamber_OuterRoom_Braille_1C5359 + braillemessage SealedChamber_OuterRoom_Braille_GHI waitbuttonpress erasebox 0, 0, 29, 19 releaseall @@ -44,7 +44,7 @@ SealedChamber_OuterRoom_EventScript_15F13A:: @ 815F13A SealedChamber_OuterRoom_EventScript_15F148:: @ 815F148 lockall - braillemessage SealedChamber_OuterRoom_Braille_1C5363 + braillemessage SealedChamber_OuterRoom_Braille_MNO waitbuttonpress erasebox 0, 0, 29, 19 releaseall @@ -52,7 +52,7 @@ SealedChamber_OuterRoom_EventScript_15F148:: @ 815F148 SealedChamber_OuterRoom_EventScript_15F156:: @ 815F156 lockall - braillemessage SealedChamber_OuterRoom_Braille_1C536D + braillemessage SealedChamber_OuterRoom_Braille_TUV waitbuttonpress erasebox 0, 0, 29, 19 releaseall @@ -60,7 +60,7 @@ SealedChamber_OuterRoom_EventScript_15F156:: @ 815F156 SealedChamber_OuterRoom_EventScript_15F164:: @ 815F164 lockall - braillemessage SealedChamber_OuterRoom_Braille_1C5377 + braillemessage SealedChamber_OuterRoom_Braille_DEF waitbuttonpress erasebox 0, 0, 29, 19 releaseall @@ -68,7 +68,7 @@ SealedChamber_OuterRoom_EventScript_15F164:: @ 815F164 SealedChamber_OuterRoom_EventScript_15F172:: @ 815F172 lockall - braillemessage SealedChamber_OuterRoom_Braille_1C5381 + braillemessage SealedChamber_OuterRoom_Braille_JKL waitbuttonpress erasebox 0, 0, 29, 19 releaseall @@ -76,7 +76,7 @@ SealedChamber_OuterRoom_EventScript_15F172:: @ 815F172 SealedChamber_OuterRoom_EventScript_15F180:: @ 815F180 lockall - braillemessage SealedChamber_OuterRoom_Braille_1C538B + braillemessage SealedChamber_OuterRoom_Braille_PQRS waitbuttonpress erasebox 0, 0, 29, 19 releaseall @@ -84,7 +84,7 @@ SealedChamber_OuterRoom_EventScript_15F180:: @ 815F180 SealedChamber_OuterRoom_EventScript_15F18E:: @ 815F18E lockall - braillemessage SealedChamber_OuterRoom_Braille_1C5396 + braillemessage SealedChamber_OuterRoom_Braille_Period waitbuttonpress erasebox 0, 0, 29, 19 releaseall @@ -92,7 +92,7 @@ SealedChamber_OuterRoom_EventScript_15F18E:: @ 815F18E SealedChamber_OuterRoom_EventScript_15F19C:: @ 815F19C lockall - braillemessage SealedChamber_OuterRoom_Braille_1C539E + braillemessage SealedChamber_OuterRoom_Braille_WXYZ waitbuttonpress erasebox 0, 0, 29, 19 releaseall @@ -100,7 +100,7 @@ SealedChamber_OuterRoom_EventScript_15F19C:: @ 815F19C SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA lockall - braillemessage SealedChamber_OuterRoom_Braille_1C53A9 + braillemessage SealedChamber_OuterRoom_Braille_Comma waitbuttonpress erasebox 0, 0, 29, 19 releaseall @@ -109,7 +109,7 @@ SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8 lockall goto_if_set FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_15F1CF - braillemessage SealedChamber_OuterRoom_Braille_1C53B1 + braillemessage SealedChamber_OuterRoom_Braille_DigHere waitbuttonpress erasebox 0, 0, 29, 19 releaseall @@ -122,7 +122,7 @@ SealedChamber_OuterRoom_EventScript_15F1CF:: @ 815F1CF SealedChamber_OuterRoom_EventScript_15F1D9:: @ 815F1D9 lockall - braillemessage SealedChamber_OuterRoom_Braille_1C53B1 + braillemessage SealedChamber_OuterRoom_Braille_DigHere waitbuttonpress erasebox 0, 0, 29, 19 releaseall diff --git a/data/maps/Underwater_SealedChamber/scripts.inc b/data/maps/Underwater_SealedChamber/scripts.inc index 8de83458d..d4c863ce4 100644 --- a/data/maps/Underwater_SealedChamber/scripts.inc +++ b/data/maps/Underwater_SealedChamber/scripts.inc @@ -20,7 +20,7 @@ Underwater_SealedChamber_EventScript_15F0AF:: @ 815F0AF Underwater_SealedChamber_EventScript_15F0B8:: @ 815F0B8 lockall - braillemessage Underwater_SealedChamber_Braille_1C533D + braillemessage Underwater_SealedChamber_Braille_GoUpHere waitbuttonpress erasebox 0, 0, 29, 19 releaseall diff --git a/data/text/braille.inc b/data/text/braille.inc index 66b6438a6..b9f6fe611 100644 --- a/data/text/braille.inc +++ b/data/text/braille.inc @@ -1,222 +1,112 @@ -Underwater_SealedChamber_Braille_1C533D:: @ 81C533D - .byte 3 - .byte 6 - .byte 27 - .byte 13 - .byte 5 - .byte 9 +Underwater_SealedChamber_Braille_GoUpHere: + brailleformat 3, 6, 27, 13, 5, 9 .braille "GO UP HERE.$" -SealedChamber_OuterRoom_Braille_1C534F:: @ 81C534F - .byte 9 - .byte 6 - .byte 19 - .byte 13 - .byte 12 - .byte 9 +SealedChamber_OuterRoom_Braille_ABC: + brailleformat 9, 6, 19, 13, 12, 9 .braille "ABC$" -SealedChamber_OuterRoom_Braille_1C5359:: @ 81C5359 - .byte 9 - .byte 6 - .byte 19 - .byte 13 - .byte 12 - .byte 9 +SealedChamber_OuterRoom_Braille_GHI: + brailleformat 9, 6, 19, 13, 12, 9 .braille "GHI$" -SealedChamber_OuterRoom_Braille_1C5363:: @ 81C5363 - .byte 9 - .byte 6 - .byte 19 - .byte 13 - .byte 12 - .byte 9 +SealedChamber_OuterRoom_Braille_MNO: + brailleformat 9, 6, 19, 13, 12, 9 .braille "MNO$" -SealedChamber_OuterRoom_Braille_1C536D:: @ 81C536D - .byte 9 - .byte 6 - .byte 19 - .byte 13 - .byte 12 - .byte 9 +SealedChamber_OuterRoom_Braille_TUV: + brailleformat 9, 6, 19, 13, 12, 9 .braille "TUV$" -SealedChamber_OuterRoom_Braille_1C5377:: @ 81C5377 - .byte 9 - .byte 6 - .byte 19 - .byte 13 - .byte 12 - .byte 9 +SealedChamber_OuterRoom_Braille_DEF: + brailleformat 9, 6, 19, 13, 12, 9 .braille "DEF$" -SealedChamber_OuterRoom_Braille_1C5381:: @ 81C5381 - .byte 9 - .byte 6 - .byte 19 - .byte 13 - .byte 12 - .byte 9 +SealedChamber_OuterRoom_Braille_JKL: + brailleformat 9, 6, 19, 13, 12, 9 .braille "JKL$" -SealedChamber_OuterRoom_Braille_1C538B:: @ 81C538B - .byte 7 - .byte 6 - .byte 21 - .byte 13 - .byte 11 - .byte 9 +SealedChamber_OuterRoom_Braille_PQRS: + brailleformat 7, 6, 21, 13, 11, 9 .braille "PQRS$" -SealedChamber_OuterRoom_Braille_1C5396:: @ 81C5396 - .byte 10 - .byte 6 - .byte 18 - .byte 13 - .byte 14 - .byte 9 +SealedChamber_OuterRoom_Braille_Period: + brailleformat 10, 6, 18, 13, 14, 9 .braille ".$" -SealedChamber_OuterRoom_Braille_1C539E:: @ 81C539E - .byte 7 - .byte 6 - .byte 21 - .byte 13 - .byte 11 - .byte 9 +SealedChamber_OuterRoom_Braille_WXYZ: + brailleformat 7, 6, 21, 13, 11, 9 .braille "WXYZ$" -SealedChamber_OuterRoom_Braille_1C53A9:: @ 81C53A9 - .byte 10 - .byte 6 - .byte 18 - .byte 13 - .byte 14 - .byte 9 +SealedChamber_OuterRoom_Braille_Comma: + brailleformat 10, 6, 18, 13, 14, 9 .braille ",$" -SealedChamber_OuterRoom_Braille_1C53B1:: @ 81C53B1 - .byte 5 - .byte 6 - .byte 25 - .byte 13 - .byte 7 - .byte 9 +SealedChamber_OuterRoom_Braille_DigHere: + brailleformat 5, 6, 25, 13, 7, 9 .braille "DIG HERE.$" -SealedChamber_InnerRoom_Braille_1C53C1:: @ 81C53C1 - .byte 3 - .byte 0 - .byte 27 - .byte 19 - .byte 5 - .byte 3 +SealedChamber_InnerRoom_Braille_FirstRelicanthLastWailord: + brailleformat 3, 0, 27, 19, 5, 3 .braille "FIRST COMES\n" .braille "RELICANTH.\n" .braille "LAST COMES\n" .braille "WAILORD.$" -SealedChamber_InnerRoom_Braille_1C53F2:: @ 81C53F2 - .byte 6 - .byte 0 - .byte 22 - .byte 19 - .byte 8 - .byte 3 +SealedChamber_InnerRoom_Braille_InThisCaveWeHaveLived: + brailleformat 6, 0, 22, 19, 8, 3 .braille "IN THIS\n" .braille "CAVE WE\n" .braille "HAVE\n" .braille "LIVED.$" -SealedChamber_InnerRoom_Braille_1C5414:: @ 81C5414 - .byte 4 - .byte 2 - .byte 26 - .byte 17 - .byte 6 - .byte 5 +SealedChamber_InnerRoom_Braille_WeOweAllToThePokemon: + brailleformat 4, 2, 26, 17, 6, 5 .braille "WE OWE ALL\n" .braille "TO THE\n" .braille "POKEMON.$" -SealedChamber_InnerRoom_Braille_1C5435:: @ 81C5435 - .byte 3 - .byte 0 - .byte 25 - .byte 19 - .byte 5 - .byte 3 +SealedChamber_InnerRoom_Braille_ButWeSealedThePokemonAway: + brailleformat 3, 0, 25, 19, 5, 3 .braille "BUT, WE\n" .braille "SEALED THE\n" .braille "POKEMON\n" .braille "AWAY.$" -SealedChamber_InnerRoom_Braille_1C545C:: @ 81C545C - .byte 1 - .byte 6 - .byte 29 - .byte 13 - .byte 3 - .byte 9 +SealedChamber_InnerRoom_Braille_WeFearedIt: + brailleformat 1, 6, 29, 13, 3, 9 .braille "WE FEARED IT.$" -SealedChamber_InnerRoom_Braille_1C5470:: @ 81C5470 - .byte 4 - .byte 0 - .byte 26 - .byte 19 - .byte 6 - .byte 3 +SealedChamber_InnerRoom_Braille_ThoseWithCourageHope: + brailleformat 4, 0, 26, 19, 6, 3 .braille "THOSE WITH\n" .braille "COURAGE,\n" .braille "THOSE WITH\n" .braille "HOPE.$" -SealedChamber_InnerRoom_Braille_1C549B:: @ 81C549B - .byte 2 - .byte 0 - .byte 28 - .byte 19 - .byte 4 - .byte 3 +SealedChamber_InnerRoom_Braille_1C549B: + brailleformat 2, 0, 28, 19, 4, 3 .braille "OPEN A DOOR.\n" .braille "AN ETERNAL\n" .braille "POKEMON\n" .braille "WAITS.$" -DesertRuins_Braille_1C54C8:: @ 81C54C8 - .byte 0 - .byte 0 - .byte 29 - .byte 19 - .byte 2 - .byte 3 +DesertRuins_Braille_UseStrength: + brailleformat 0, 0, 29, 19, 2, 3 .braille "RIGHT, RIGHT,\n" .braille "DOWN, DOWN.\n" .braille "THEN, USE\n" .braille "STRENGTH.$" -IslandCave_Braille_1C54FC:: @ 81C54FC - .byte 3 - .byte 0 - .byte 27 - .byte 19 - .byte 5 - .byte 3 +IslandCave_Braille_WaitTwoMinutes: + brailleformat 3, 0, 27, 19, 5, 3 .braille "STOP AND\n" .braille "WAIT. WAIT\n" .braille "FOR TIME TO\n" .braille "PASS TWICE.$" -AncientTomb_Braille_1C552E:: @ 81C552E - .byte 0 - .byte 0 - .byte 29 - .byte 19 - .byte 1 - .byte 3 +AncientTomb_Braille_AimToTheSkyInTheMiddle: + brailleformat 0, 0, 29, 19, 1, 3 .braille "WITH NEW TIME,\n" .braille "HOPE AND LOVE,\n" .braille "AIM TO THE SKY\n" diff --git a/include/macros/event.inc b/include/macros/event.inc index 3bc9f251f..8c10e3182 100644 --- a/include/macros/event.inc +++ b/include/macros/event.inc @@ -879,6 +879,16 @@ .4byte \text .endm + @ Formatting for the braille window, to be put at the start of a pointer used by braillemessage. + .macro brailleformat winLeft:req, winTop:req, winRight:req, winBottom:req, textLeft:req, textTop:req + .byte \winLeft + .byte \winTop + .byte \winRight + .byte \winBottom + .byte \textLeft + .byte \textTop + .endm + @ Gives the player one of the specified (species) Pokemon at level level holding item. The trailing 0s are unused parameters .macro givemon species:req, level:req, item:req .byte 0x79 diff --git a/src/scrcmd.c b/src/scrcmd.c index 417695503..e6c0354c3 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1422,15 +1422,15 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx) { u8 *ptr = (u8 *)ScriptReadWord(ctx); - u8 v2 = ptr[0]; - u8 v3 = ptr[1]; - u8 v4 = ptr[2]; - u8 v5 = ptr[3]; - u8 v6 = ptr[4]; - u8 v7 = ptr[5]; + u8 winLeft = ptr[0]; + u8 winTop = ptr[1]; + u8 winRight = ptr[2]; + u8 winBottom = ptr[3]; + u8 textLeft = ptr[4]; + u8 textTop = ptr[5]; StringBraille(gStringVar4, ptr + 6); - Menu_DrawStdWindowFrame(v2, v3, v4, v5); - Menu_PrintText(gStringVar4, v6, v7); + Menu_DrawStdWindowFrame(winLeft, winTop, winRight, winBottom); + Menu_PrintText(gStringVar4, textLeft, textTop); return FALSE; }