summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/battle_scripts_1.s22
-rw-r--r--data/maps/LilycoveCity_ContestLobby/scripts.inc4
-rw-r--r--data/script_cmd_table.inc6
-rw-r--r--data/scripts/trainer_battle.inc43
-rw-r--r--data/specials.inc6
-rw-r--r--data/text/braille.inc154
6 files changed, 65 insertions, 170 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 1c3f3ea5b..6e0476182 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -2989,7 +2989,7 @@ BattleScript_LocalBattleLostDoTrainer2WinText::
BattleScript_LocalBattleLostEnd_::
end2
-BattleScript_82DAA0B::
+BattleScript_FrontierLinkBattleLost::
returnopponentmon1toball BS_ATTACKER
waitstate
returnopponentmon2toball BS_ATTACKER
@@ -3002,23 +3002,23 @@ BattleScript_82DAA0B::
trainerslidein BS_FAINTED
waitstate
printstring STRINGID_TRAINER2WINTEXT
- jumpifbattletype BATTLE_TYPE_RECORDED, BattleScript_82DAA31
- atk57
-BattleScript_82DAA31::
+ jumpifbattletype BATTLE_TYPE_RECORDED, BattleScript_FrontierLinkBattleLostEnd
+ endlinkbattle
+BattleScript_FrontierLinkBattleLostEnd::
waitmessage 0x40
end2
BattleScript_LinkBattleWonOrLost::
- jumpifbattletype BATTLE_TYPE_BATTLE_TOWER, BattleScript_82DAA5C
+ jumpifbattletype BATTLE_TYPE_BATTLE_TOWER, BattleScript_TowerLinkBattleWon
printstring STRINGID_BATTLEEND
waitmessage 0x40
jumpifbattletype BATTLE_TYPE_RECORDED, BattleScript_LinkBattleWonOrLostWaitEnd
- atk57
+ endlinkbattle
BattleScript_LinkBattleWonOrLostWaitEnd::
waitmessage 0x40
end2
-BattleScript_82DAA5C::
+BattleScript_TowerLinkBattleWon::
playtrainerdefeatbgm BS_ATTACKER
printstring STRINGID_BATTLEEND
waitmessage 0x40
@@ -3030,9 +3030,9 @@ BattleScript_82DAA5C::
trainerslidein BS_FAINTED
waitstate
printstring STRINGID_TRAINER2LOSETEXT
- jumpifbattletype BATTLE_TYPE_RECORDED, BattleScript_82DAA83
- atk57
-BattleScript_82DAA83::
+ jumpifbattletype BATTLE_TYPE_RECORDED, BattleScript_TowerLinkBattleWonEnd
+ endlinkbattle
+BattleScript_TowerLinkBattleWonEnd::
waitmessage 0x40
end2
@@ -4566,6 +4566,6 @@ BattleScript_PrintPlayerForfeited::
BattleScript_PrintPlayerForfeitedLinkBattle::
printstring STRINGID_FORFEITEDMATCH
waitmessage 0x40
- atk57
+ endlinkbattle
waitmessage 0x40
end2
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index 51c38e3f4..3a3b3d86b 100644
--- a/data/maps/LilycoveCity_ContestLobby/scripts.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -783,7 +783,7 @@ LilycoveCity_ContestLobby_EventScript_TrySetUpLinkContest:: @ 821AA15
goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkError
compare VAR_RESULT, LINKUP_FAILED_CONTEST_GMODE
goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkModeDifference
- message3 LilycoveCity_ContestLobby_Text_Transmitting
+ messageinstant LilycoveCity_ContestLobby_Text_Transmitting
contestlinktransfer
switch VAR_0x8004
case 0, LilycoveCity_ContestLobby_EventScript_StartLinkContest
@@ -926,7 +926,7 @@ LilycoveCity_ContestLobby_EventScript_TryJoinLinkGroup:: @ 821AC38
return
LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided:: @ 821AC3D
- message3 LilycoveCity_ContestLobby_Text_Transmitting
+ messageinstant LilycoveCity_ContestLobby_Text_Transmitting
contestlinktransfer
goto LilycoveCity_ContestLobby_EventScript_StartLinkContest
end
diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc
index 7edb5c4b7..f89e0a72a 100644
--- a/data/script_cmd_table.inc
+++ b/data/script_cmd_table.inc
@@ -216,10 +216,10 @@ gScriptCmdTable:: @ 81DB67C
.4byte ScrCmd_initrotatingtilepuzzle @ 0xd5
.4byte ScrCmd_freerotatingtilepuzzle @ 0xd6
.4byte ScrCmd_warpmossdeepgym @ 0xd7
- .4byte ScrCmd_cmdD8 @ 0xd8
- .4byte ScrCmd_cmdD9 @ 0xd9
+ .4byte ScrCmd_selectapproachingtrainer @ 0xd8
+ .4byte ScrCmd_lockfortrainer @ 0xd9
.4byte ScrCmd_closebraillemessage @ 0xda
- .4byte ScrCmd_cmdDB @ 0xdb
+ .4byte ScrCmd_messageinstant @ 0xdb
.4byte ScrCmd_fadescreenswapbuffers @ 0xdc
.4byte ScrCmd_buffertrainerclassname @ 0xdd
.4byte ScrCmd_buffertrainername @ 0xde
diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc
index aa96e7b35..0b5c1118b 100644
--- a/data/scripts/trainer_battle.inc
+++ b/data/scripts/trainer_battle.inc
@@ -1,10 +1,9 @@
-EventScript_271354:: @ 8271354
- cmdD8
- cmdD9
-
-EventScript_ShowSecondTrainerIntro:: @ 8271356
- special SetUpTrainerEncounterMusic
- special EndTrainerApproach
+EventScript_StartTrainerApproach:: @ 8271354
+ selectapproachingtrainer
+ lockfortrainer
+EventScript_TrainerApproach:: @ 8271356
+ special PlayTrainerEncounterMusic
+ special DoTrainerApproach
waitstate
goto EventScript_ShowTrainerIntroMsg
@@ -14,11 +13,12 @@ EventScript_TryDoNormalTrainerBattle:: @ 8271362
applymovement VAR_LAST_TALKED, Movement_RevealTrainer
waitmovement 0
specialvar VAR_RESULT, GetTrainerFlag
- compare VAR_RESULT, 0
+ compare VAR_RESULT, FALSE
goto_if_ne EventScript_NoNormalTrainerBattle
- special SetUpTrainerEncounterMusic
- special SetUpTrainerMovement
+ special PlayTrainerEncounterMusic
+ special SetTrainerFacingDirection
goto EventScript_ShowTrainerIntroMsg
+
EventScript_NoNormalTrainerBattle:: @ 8271389
gotopostbattlescript
@@ -27,27 +27,29 @@ EventScript_TryDoDoubleTrainerBattle:: @ 827138A
faceplayer
call EventScript_RevealTrainer
specialvar VAR_RESULT, GetTrainerFlag
- compare VAR_RESULT, 0
+ compare VAR_RESULT, FALSE
goto_if_ne EventScript_NoDoubleTrainerBattle
special HasEnoughMonsForDoubleBattle
compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
goto_if_ne EventScript_NotEnoughMonsForDoubleBattle
- special SetUpTrainerEncounterMusic
- special SetUpTrainerMovement
+ special PlayTrainerEncounterMusic
+ special SetTrainerFacingDirection
goto EventScript_ShowTrainerIntroMsg
+
EventScript_NotEnoughMonsForDoubleBattle:: @ 82713BA
special ShowTrainerCantBattleSpeech
waitmessage
waitbuttonpress
release
end
+
EventScript_NoDoubleTrainerBattle:: @ 82713C1
gotopostbattlescript
EventScript_DoNoIntroTrainerBattle:: @ 82713C2
applymovement VAR_LAST_TALKED, Movement_RevealTrainer
waitmovement 0
- special SetUpTrainerEncounterMusic
+ special PlayTrainerEncounterMusic
trainerbattlebegin
gotopostbattlescript
@@ -56,8 +58,8 @@ EventScript_TryDoRematchBattle:: @ 82713D1
specialvar VAR_RESULT, IsTrainerReadyForRematch
compare VAR_RESULT, FALSE
goto_if_eq EventScript_NoRematchTrainerBattle
- special SetUpTrainerEncounterMusic
- special SetUpTrainerMovement
+ special PlayTrainerEncounterMusic
+ special SetTrainerFacingDirection
special ShowTrainerIntroSpeech
waitmessage
waitbuttonpress
@@ -65,6 +67,7 @@ EventScript_TryDoRematchBattle:: @ 82713D1
waitstate
releaseall
end
+
EventScript_NoRematchTrainerBattle:: @ 82713F7
gotopostbattlescript
@@ -75,8 +78,8 @@ EventScript_TryDoDoubleRematchBattle:: @ 82713F8
special HasEnoughMonsForDoubleBattle
compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
goto_if_ne EventScript_NotEnoughMonsForDoubleRematchBattle
- special SetUpTrainerEncounterMusic
- special SetUpTrainerMovement
+ special PlayTrainerEncounterMusic
+ special SetTrainerFacingDirection
special ShowTrainerIntroSpeech
waitmessage
waitbuttonpress
@@ -84,8 +87,10 @@ EventScript_TryDoDoubleRematchBattle:: @ 82713F8
waitstate
releaseall
end
+
EventScript_NoDoubleRematchTrainerBattle:: @ 8271427
gotopostbattlescript
+
EventScript_NotEnoughMonsForDoubleRematchBattle:: @ 8271428
special ShowTrainerCantBattleSpeech
waitmessage
@@ -108,7 +113,7 @@ EventScript_ShowTrainerIntroMsg:: @ 827143C
waitbuttonpress
special TryPrepareSecondApproachingTrainer
compare VAR_RESULT, TRUE
- goto_if_eq EventScript_ShowSecondTrainerIntro
+ goto_if_eq EventScript_TrainerApproach
goto EventScript_DoTrainerBattle
EventScript_DoTrainerBattle:: @ 8271454
diff --git a/data/specials.inc b/data/specials.inc
index 77e7d5c0a..3e1d1862d 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -66,8 +66,8 @@ gSpecials:: @ 81DBA64
def_special ShowTrainerIntroSpeech
def_special ShowTrainerCantBattleSpeech
def_special GetTrainerFlag
- def_special EndTrainerApproach
- def_special SetUpTrainerEncounterMusic
+ def_special DoTrainerApproach
+ def_special PlayTrainerEncounterMusic
def_special ShouldTryRematchBattle
def_special IsTrainerReadyForRematch
def_special BattleSetup_StartRematchBattle
@@ -324,7 +324,7 @@ gSpecials:: @ 81DBA64
def_special StartGroudonKyogreBattle
def_special BattleSetup_StartLegendaryBattle
def_special StartRegiBattle
- def_special SetUpTrainerMovement
+ def_special SetTrainerFacingDirection
def_special DoSealedChamberShakingEffect2
def_special FoundBlackGlasses
def_special StartDroughtWeatherBlend
diff --git a/data/text/braille.inc b/data/text/braille.inc
index 30f9b44d4..57b77e393 100644
--- a/data/text/braille.inc
+++ b/data/text/braille.inc
@@ -1,222 +1,112 @@
Underwater_SealedChamber_Braille_GoUpHere: @ 82A6B15
- .byte 4
- .byte 6
- .byte 26
- .byte 13
- .byte 7
- .byte 9
+ brailleformat 4, 6, 26, 13, 7, 9
.braille "GO UP HERE.$"
SealedChamber_OuterRoom_Braille_ABC: @ 82A6B27
- .byte 7
- .byte 6
- .byte 21
- .byte 13
- .byte 10
- .byte 9
+ brailleformat 7, 6, 21, 13, 10, 9
.braille "ABC$"
SealedChamber_OuterRoom_Braille_GHI: @ 82A6B31
- .byte 7
- .byte 6
- .byte 21
- .byte 13
- .byte 10
- .byte 9
+ brailleformat 7, 6, 21, 13, 10, 9
.braille "GHI$"
SealedChamber_OuterRoom_Braille_MNO: @ 82A6B3B
- .byte 7
- .byte 6
- .byte 21
- .byte 13
- .byte 10
- .byte 9
+ brailleformat 7, 6, 21, 13, 10, 9
.braille "MNO$"
SealedChamber_OuterRoom_Braille_TUV: @ 82A6B45
- .byte 7
- .byte 6
- .byte 21
- .byte 13
- .byte 10
- .byte 9
+ brailleformat 7, 6, 21, 13, 10, 9
.braille "TUV$"
SealedChamber_OuterRoom_Braille_DEF: @ 82A6B4F
- .byte 7
- .byte 6
- .byte 21
- .byte 13
- .byte 10
- .byte 9
+ brailleformat 7, 6, 21, 13, 10, 9
.braille "DEF$"
SealedChamber_OuterRoom_Braille_JKL: @ 82A6B59
- .byte 7
- .byte 6
- .byte 21
- .byte 13
- .byte 10
- .byte 9
+ brailleformat 7, 6, 21, 13, 10, 9
.braille "JKL$"
SealedChamber_OuterRoom_Braille_PQRS: @ 82A6B63
- .byte 7
- .byte 6
- .byte 21
- .byte 13
- .byte 10
- .byte 9
+ brailleformat 7, 6, 21, 13, 10, 9
.braille "PQRS$"
SealedChamber_OuterRoom_Braille_Period: @ 82A6B6E
- .byte 9
- .byte 6
- .byte 19
- .byte 13
- .byte 12
- .byte 9
+ brailleformat 9, 6, 19, 13, 12, 9
.braille ".$"
SealedChamber_OuterRoom_Braille_WXYZ: @ 82A6B76
- .byte 7
- .byte 6
- .byte 21
- .byte 13
- .byte 10
- .byte 9
+ brailleformat 7, 6, 21, 13, 10, 9
.braille "WXYZ$"
SealedChamber_OuterRoom_Braille_Comma: @ 82A6B81
- .byte 9
- .byte 6
- .byte 19
- .byte 13
- .byte 12
- .byte 9
+ brailleformat 9, 6, 19, 13, 12, 9
.braille ",$"
SealedChamber_OuterRoom_Braille_DigHere: @ 82A6B89
- .byte 7
- .byte 4
- .byte 23
- .byte 15
- .byte 10
- .byte 7
+ brailleformat 7, 4, 23, 15, 10, 7
.braille "DIG HERE.$"
SealedChamber_InnerRoom_Braille_FirstWailordLastRelicanth: @ 82A6B99
- .byte 0
- .byte 0
- .byte 29
- .byte 19
- .byte 3
- .byte 3
+ brailleformat 0, 0, 29, 19, 3, 3
.braille "FIRST COMES\n"
.braille "WAILORD.\n"
.braille "LAST COMES\n"
.braille "RELICANTH.$"
SealedChamber_InnerRoom_Braille_InThisCaveWeHaveLived: @ 82A6BCA
- .byte 2
- .byte 0
- .byte 26
- .byte 19
- .byte 5
- .byte 3
+ brailleformat 2, 0, 26, 19, 5, 3
.braille "IN THIS\n"
.braille "CAVE WE\n"
.braille "HAVE\n"
.braille "LIVED.$"
SealedChamber_InnerRoom_Braille_WeOweAllToThePokemon: @ 82A6BEC
- .byte 7
- .byte 2
- .byte 23
- .byte 17
- .byte 10
- .byte 5
+ brailleformat 7, 2, 23, 17, 10, 5
.braille "WE OWE ALL\n"
.braille "TO THE\n"
.braille "POKEMON.$"
SealedChamber_InnerRoom_Braille_ButWeSealedThePokemonAway: @ 82A6C0D
- .byte 3
- .byte 0
- .byte 25
- .byte 19
- .byte 6
- .byte 3
+ brailleformat 3, 0, 25, 19, 6, 3
.braille "BUT, WE\n"
.braille "SEALED THE\n"
.braille "POKEMON\n"
.braille "AWAY.$"
SealedChamber_InnerRoom_Braille_WeFearedIt: @ 82A6C34
- .byte 5
- .byte 6
- .byte 25
- .byte 13
- .byte 8
- .byte 9
+ brailleformat 5, 6, 25, 13, 8, 9
.braille "WE FEARED IT.$"
SealedChamber_InnerRoom_Braille_ThoseWithCourageHope: @ 82A6C48
- .byte 6
- .byte 0
- .byte 24
- .byte 19
- .byte 9
- .byte 3
+ brailleformat 6, 0, 24, 19, 9, 3
.braille "THOSE WITH\n"
.braille "COURAGE,\n"
.braille "THOSE WITH\n"
.braille "HOPE.$"
SealedChamber_InnerRoom_Braille_OpenDoorEternalPokemonWaits: @ 82A6C73
- .byte 3
- .byte 2
- .byte 27
- .byte 17
- .byte 6
- .byte 5
+ brailleformat 3, 2, 27, 17, 6, 5
.braille "OPEN A DOOR.\n"
.braille "AN ETERNAL\n"
.braille "POKEMON\n"
.braille "WAITS.$"
DesertRuins_Braille_UseRockSmash: @ 82A6CA0
- .byte 1
- .byte 0
- .byte 27
- .byte 19
- .byte 4
- .byte 3
+ brailleformat 1, 0, 27, 19, 4, 3
.braille "LEFT, LEFT,\n"
.braille "DOWN, DOWN.\n"
.braille "THEN, USE\n"
.braille "ROCK SMASH.$"
IslandCave_Braille_RunLapAroundWall: @ 82A6CD4
- .byte 5
- .byte 0
- .byte 25
- .byte 19
- .byte 8
- .byte 3
+ brailleformat 5, 0, 25, 19, 8, 3
.braille "STAY CLOSE\n"
.braille "TO THE WALL.\n"
.braille "RUN AROUND\n"
.braille "ONE LAP.$"
AncientTomb_Braille_ShineInTheMiddle: @ 82A6D06
- .byte 3
- .byte 0
- .byte 25
- .byte 19
- .byte 6
- .byte 3
+ brailleformat 3, 0, 25, 19, 6, 3
.braille "THOSE WHO\n"
.braille "INHERIT OUR\n"
.braille "WILL, SHINE\n"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-22 15:01:02 +0000