summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/fonts.s76
-rw-r--r--data/maps/AncientTomb/scripts.inc8
-rw-r--r--data/maps/DesertRuins/scripts.inc8
-rw-r--r--data/maps/SealedChamber_InnerRoom/scripts.inc36
-rw-r--r--data/maps/SealedChamber_OuterRoom/scripts.inc48
-rw-r--r--data/maps/Underwater_SealedChamber/scripts.inc4
-rw-r--r--data/specials.inc4
-rw-r--r--data/text/braille.inc4
8 files changed, 34 insertions, 154 deletions
diff --git a/data/fonts.s b/data/fonts.s
deleted file mode 100644
index 928372481..000000000
--- a/data/fonts.s
+++ /dev/null
@@ -1,76 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 2
-gFont8LatinGlyphs::
- .incbin "graphics/fonts/font8.latfont"
-
- .align 2
-gFont8LatinGlyphWidths::
- .include "graphics/fonts/font8_latin_widths.inc"
-
- .align 2
-gFont0LatinGlyphs::
- .incbin "graphics/fonts/font0.latfont"
-
- .align 2
-gFont0LatinGlyphWidths::
- .include "graphics/fonts/font0_latin_widths.inc"
-
- .align 2
-gFont7LatinGlyphs::
- .incbin "graphics/fonts/font7.latfont"
-
- .align 2
-gFont7LatinGlyphWidths::
- .include "graphics/fonts/font7_latin_widths.inc"
-
- .align 2
-gFont2LatinGlyphs::
- .incbin "graphics/fonts/font2.latfont"
-
- .align 2
-gFont2LatinGlyphWidths::
- .include "graphics/fonts/font2_latin_widths.inc"
-
- .align 2
-gFont1LatinGlyphs::
- .incbin "graphics/fonts/font1.latfont"
-
- .align 2
-gFont1LatinGlyphWidths::
- .include "graphics/fonts/font1_latin_widths.inc"
-
- .align 2
-gFont0JapaneseGlyphs::
- .incbin "graphics/fonts/font0.hwjpnfont"
-
- .align 2
-gFont1JapaneseGlyphs::
- .incbin "graphics/fonts/font1.hwjpnfont"
-
- .align 2
-gUnusedJapaneseFireRedLeafGreenMaleFontGlyphs::
- .incbin "graphics/fonts/unused_frlg_male.fwjpnfont"
-
- .align 2
-gUnusedJapaneseFireRedLeafGreenMaleFontGlyphWidths::
- .include "graphics/fonts/unused_japanese_frlg_male_font_widths.inc"
-
- .align 2
-gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphs::
- .incbin "graphics/fonts/unused_frlg_female.fwjpnfont"
-
- .align 2
-gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphWidths::
- .include "graphics/fonts/unused_japanese_frlg_female_font_widths.inc"
-
- .align 2
-gFont2JapaneseGlyphs::
- .incbin "graphics/fonts/font2.fwjpnfont"
-
- .align 2
-gFont2JapaneseGlyphWidths::
- .include "graphics/fonts/font2_japanese_widths.inc"
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
diff --git a/data/specials.inc b/data/specials.inc
index 82eacbac0..a863b6e13 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -315,7 +315,7 @@ gSpecials::
def_special IsStarterInParty
def_special CopyCurSecretBaseOwnerName_StrVar1
def_special ScriptCheckFreePokemonStorageSpace
- def_special DoSealedChamberShakingEffect1
+ def_special DoSealedChamberShakingEffect_Long
def_special ShowDeptStoreElevatorFloorSelect
def_special InteractWithShieldOrTVDecoration
def_special IsPokerusInParty
@@ -325,7 +325,7 @@ gSpecials::
def_special BattleSetup_StartLegendaryBattle
def_special StartRegiBattle
def_special SetTrainerFacingDirection
- def_special DoSealedChamberShakingEffect2
+ def_special DoSealedChamberShakingEffect_Short
def_special FoundBlackGlasses
def_special StartDroughtWeatherBlend
def_special DoDiveWarp
diff --git a/data/text/braille.inc b/data/text/braille.inc
index 69f0a81e3..4518c5769 100644
--- a/data/text/braille.inc
+++ b/data/text/braille.inc
@@ -1,3 +1,7 @@
+@ NOTE: The brailleformat macro in this file is leftover from RS.
+@ The numbers are simply skipped over. If you'd like to omit
+@ this macro you must also stop it from skipping over this
+@ section by editing ScrCmd_braillemessage.
Underwater_SealedChamber_Braille_GoUpHere:
brailleformat 4, 6, 26, 13, 7, 9
.braille "GO UP HERE.$"
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 22:23:01 +0000