From 71605556ab6efef43fdaed3f4e84e41c85ac719b Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 30 Oct 2021 11:59:14 -0400 Subject: Clean up braille_puzzles --- data/maps/SealedChamber_InnerRoom/scripts.inc | 8 ++++---- data/specials.inc | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'data') diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc index f81e5f9fd..8c45c81ca 100644 --- a/data/maps/SealedChamber_InnerRoom/scripts.inc +++ b/data/maps/SealedChamber_InnerRoom/scripts.inc @@ -12,18 +12,18 @@ SealedChamber_InnerRoom_EventScript_BrailleBackWall:: 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 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 -- cgit v1.2.3 From 13cd2a41f03ca56f45cab6769cb2738070cc5cf2 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 30 Oct 2021 16:19:10 -0400 Subject: Better braille support --- data/maps/AncientTomb/scripts.inc | 8 ++--- data/maps/DesertRuins/scripts.inc | 8 ++--- data/maps/SealedChamber_InnerRoom/scripts.inc | 28 ++++----------- data/maps/SealedChamber_OuterRoom/scripts.inc | 48 +++++++------------------- data/maps/Underwater_SealedChamber/scripts.inc | 4 +-- data/text/braille.inc | 4 +++ 6 files changed, 28 insertions(+), 72 deletions(-) (limited to 'data') 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 8c45c81ca..7d240535c 100644 --- a/data/maps/SealedChamber_InnerRoom/scripts.inc +++ b/data/maps/SealedChamber_InnerRoom/scripts.inc @@ -3,9 +3,7 @@ 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 @@ -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/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.$" -- cgit v1.2.3 From fdaf436960b4a1feab037eafdb76e279ddc787e2 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 30 Oct 2021 16:47:37 -0400 Subject: Add font id constants --- data/fonts.s | 56 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'data') diff --git a/data/fonts.s b/data/fonts.s index 928372481..4fdf029b4 100644 --- a/data/fonts.s +++ b/data/fonts.s @@ -4,52 +4,52 @@ .section .rodata .align 2 -gFont8LatinGlyphs:: - .incbin "graphics/fonts/font8.latfont" +gFontSmallNarrowLatinGlyphs:: + .incbin "graphics/fonts/small_narrow/glyphs.latfont" .align 2 -gFont8LatinGlyphWidths:: - .include "graphics/fonts/font8_latin_widths.inc" +gFontSmallNarrowLatinGlyphWidths:: + .include "graphics/fonts/small_narrow/latin_widths.inc" .align 2 -gFont0LatinGlyphs:: - .incbin "graphics/fonts/font0.latfont" +gFontSmallLatinGlyphs:: + .incbin "graphics/fonts/small/glyphs.latfont" .align 2 -gFont0LatinGlyphWidths:: - .include "graphics/fonts/font0_latin_widths.inc" +gFontSmallLatinGlyphWidths:: + .include "graphics/fonts/small/latin_widths.inc" .align 2 -gFont7LatinGlyphs:: - .incbin "graphics/fonts/font7.latfont" +gFontNarrowLatinGlyphs:: + .incbin "graphics/fonts/narrow/glyphs.latfont" .align 2 -gFont7LatinGlyphWidths:: - .include "graphics/fonts/font7_latin_widths.inc" +gFontNarrowLatinGlyphWidths:: + .include "graphics/fonts/narrow/latin_widths.inc" .align 2 -gFont2LatinGlyphs:: - .incbin "graphics/fonts/font2.latfont" +gFontShortLatinGlyphs:: + .incbin "graphics/fonts/short/glyphs.latfont" .align 2 -gFont2LatinGlyphWidths:: - .include "graphics/fonts/font2_latin_widths.inc" +gFontShortLatinGlyphWidths:: + .include "graphics/fonts/short/latin_widths.inc" .align 2 -gFont1LatinGlyphs:: - .incbin "graphics/fonts/font1.latfont" +gFontNormalLatinGlyphs:: + .incbin "graphics/fonts/normal/glyphs.latfont" .align 2 -gFont1LatinGlyphWidths:: - .include "graphics/fonts/font1_latin_widths.inc" +gFontNormalLatinGlyphWidths:: + .include "graphics/fonts/normal/latin_widths.inc" .align 2 -gFont0JapaneseGlyphs:: - .incbin "graphics/fonts/font0.hwjpnfont" +gFontSmallJapaneseGlyphs:: + .incbin "graphics/fonts/small/glyphs.hwjpnfont" .align 2 -gFont1JapaneseGlyphs:: - .incbin "graphics/fonts/font1.hwjpnfont" +gFontNormalJapaneseGlyphs:: + .incbin "graphics/fonts/normal/glyphs.hwjpnfont" .align 2 gUnusedJapaneseFireRedLeafGreenMaleFontGlyphs:: @@ -68,9 +68,9 @@ gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphWidths:: .include "graphics/fonts/unused_japanese_frlg_female_font_widths.inc" .align 2 -gFont2JapaneseGlyphs:: - .incbin "graphics/fonts/font2.fwjpnfont" +gFontShortJapaneseGlyphs:: + .incbin "graphics/fonts/short/glyphs.fwjpnfont" .align 2 -gFont2JapaneseGlyphWidths:: - .include "graphics/fonts/font2_japanese_widths.inc" +gFontShortJapaneseGlyphWidths:: + .include "graphics/fonts/short/japanese_widths.inc" -- cgit v1.2.3 From 36039e1b86631bf92c6bb06ee27357a6a40ca4bd Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 31 Oct 2021 01:44:18 -0400 Subject: Convert fonts.s to C --- data/fonts.s | 76 ------------------------------------------------------------ 1 file changed, 76 deletions(-) delete mode 100644 data/fonts.s (limited to 'data') diff --git a/data/fonts.s b/data/fonts.s deleted file mode 100644 index 4fdf029b4..000000000 --- a/data/fonts.s +++ /dev/null @@ -1,76 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gFontSmallNarrowLatinGlyphs:: - .incbin "graphics/fonts/small_narrow/glyphs.latfont" - - .align 2 -gFontSmallNarrowLatinGlyphWidths:: - .include "graphics/fonts/small_narrow/latin_widths.inc" - - .align 2 -gFontSmallLatinGlyphs:: - .incbin "graphics/fonts/small/glyphs.latfont" - - .align 2 -gFontSmallLatinGlyphWidths:: - .include "graphics/fonts/small/latin_widths.inc" - - .align 2 -gFontNarrowLatinGlyphs:: - .incbin "graphics/fonts/narrow/glyphs.latfont" - - .align 2 -gFontNarrowLatinGlyphWidths:: - .include "graphics/fonts/narrow/latin_widths.inc" - - .align 2 -gFontShortLatinGlyphs:: - .incbin "graphics/fonts/short/glyphs.latfont" - - .align 2 -gFontShortLatinGlyphWidths:: - .include "graphics/fonts/short/latin_widths.inc" - - .align 2 -gFontNormalLatinGlyphs:: - .incbin "graphics/fonts/normal/glyphs.latfont" - - .align 2 -gFontNormalLatinGlyphWidths:: - .include "graphics/fonts/normal/latin_widths.inc" - - .align 2 -gFontSmallJapaneseGlyphs:: - .incbin "graphics/fonts/small/glyphs.hwjpnfont" - - .align 2 -gFontNormalJapaneseGlyphs:: - .incbin "graphics/fonts/normal/glyphs.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 -gFontShortJapaneseGlyphs:: - .incbin "graphics/fonts/short/glyphs.fwjpnfont" - - .align 2 -gFontShortJapaneseGlyphWidths:: - .include "graphics/fonts/short/japanese_widths.inc" -- cgit v1.2.3