dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokefirered into sync-cableclub

Browse Source
This commit is contained in:
GriffinR
2022-09-03 14:19:50 -04:00
parent 321f5371d8 097fc309f6
commit 76ec1837aa
197 changed files with 9544 additions and 9398 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/battle_scripts_1.s
+2 -2
View File
@@ -2977,7 +2977,7 @@ BattleScript_BattleTowerLostLostSkipMonRecall::
waitstate
printstring STRINGID_TRAINER1WINTEXT
jumpifnotbattletype BATTLE_TYPE_DOUBLE, BattleScript_BattleTowerLostLostSkipDouble
printstring STRINGID_TRAINER2NAME
printstring STRINGID_TRAINER2WINTEXT
BattleScript_BattleTowerLostLostSkipDouble::
end2
@@ -2995,7 +2995,7 @@ BattleScript_BattleTowerTrainerBattleWon::
jumpifnotbattletype BATTLE_TYPE_TRAINER_TOWER, BattleScript_BattleTowerEtcTrainerBattleWonSkipText
printstring STRINGID_TRAINER1LOSETEXT
jumpifnotbattletype BATTLE_TYPE_DOUBLE, BattleScript_BattleTowerEtcTrainerBattleWonSkipText
printstring STRINGID_TRAINER2CLASS
printstring STRINGID_TRAINER2LOSETEXT
BattleScript_BattleTowerEtcTrainerBattleWonSkipText::
pickup
end2