dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1536 from GriffinRichards/clean-braille

Browse Source 
Add font id constants, better braille support
This commit is contained in:
GriffinR
2021-11-03 13:17:29 -04:00
committed by GitHub
parent 0ba22ca112 929aade0fd
commit e14210ce1f
134 changed files with 2116 additions and 1967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
data/fonts.s
View File

@@ -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"

8
data/maps/AncientTomb/scripts.inc
View File

@@ -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

8
data/maps/DesertRuins/scripts.inc
View File

@@ -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

36
data/maps/SealedChamber_InnerRoom/scripts.inc
View File

@@ -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

48
data/maps/SealedChamber_OuterRoom/scripts.inc
View File

@@ -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

4
data/maps/Underwater_SealedChamber/scripts.inc
View File

@@ -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

4
data/specials.inc
View File

@@ -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

4
data/text/braille.inc
View File

@@ -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.$"