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

Finish documentation of battle_scripts_1

Browse Source
This commit is contained in:
PikalaxALT
2019-11-06 18:15:43 -05:00
parent d97eb6353d
commit 60b75e85c9
3 changed files with 411 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/battle_scripts_1.s
+408 -415
View File
File diff suppressed because it is too large Load Diff
include/battle_scripts.h
+2 -2
View File
@@ -29,7 +29,7 @@ extern const u8 BattleScript_LocalBattleLostPrintWhiteOut[];
extern const u8 BattleScript_LocalBattleLostEnd[]; extern const u8 BattleScript_LocalBattleLostEnd[];
extern const u8 BattleScript_CheckDomeDrew[]; extern const u8 BattleScript_CheckDomeDrew[];
extern const u8 BattleScript_LinkBattleWonOrLost[]; extern const u8 BattleScript_LinkBattleWonOrLost[];
extern const u8 BattleScript_FrontierTrainerBattleWon[]; extern const u8 BattleScript_BattleTowerTrainerBattleWon[];
extern const u8 BattleScript_SmokeBallEscape[]; extern const u8 BattleScript_SmokeBallEscape[];
extern const u8 BattleScript_RanAwayUsingMonAbility[]; extern const u8 BattleScript_RanAwayUsingMonAbility[];
extern const u8 BattleScript_GotAwaySafely[]; extern const u8 BattleScript_GotAwaySafely[];
@@ -228,7 +228,7 @@ extern const u8 BattleScript_SpikesOnFaintedBattler[];
extern const u8 BattleScript_GhostBallDodge[]; extern const u8 BattleScript_GhostBallDodge[];
extern const u8 gUnknown_81D9A88[]; extern const u8 gUnknown_81D9A88[];
extern const u8 gUnknown_81D91A1[]; // knizz: silph scope unveil extern const u8 gUnknown_81D91A1[]; // knizz: silph scope unveil
extern const u8 gUnknown_81D88D7[]; extern const u8 BattleScript_BattleTowerTrainerBattleWon[];
extern const u8 *const gBattleScriptsForMoveEffects[]; extern const u8 *const gBattleScriptsForMoveEffects[];
extern const u8 *const gBattlescriptsForBallThrow[]; extern const u8 *const gBattlescriptsForBallThrow[];
src/battle_main.c
+1 -1
View File
@@ -3675,7 +3675,7 @@ static void HandleEndTurn_BattleWon(void)
{ {
BattleStopLowHpSound(); BattleStopLowHpSound();
PlayBGM(MUS_WIN_TRE); PlayBGM(MUS_WIN_TRE);
gBattlescriptCurrInstr = gUnknown_81D88D7; gBattlescriptCurrInstr = BattleScript_BattleTowerTrainerBattleWon;
} }
else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & BATTLE_TYPE_LINK)) else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & BATTLE_TYPE_LINK))
{ {