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

Rename ghost battle scripts

Browse Source
This commit is contained in:
PikalaxALT
2019-11-06 18:32:17 -05:00
parent f14f13b312
commit 4cad26157e
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/battle_scripts_1.s
+3 -3
View File
@@ -3816,18 +3816,18 @@ BattleScript_TargetPRLZHeal::
updatestatusicon BS_TARGET updatestatusicon BS_TARGET
return return
gUnknown_81D9180:: BattleScript_TooScaredToMove::
printstring STRINGID_MONTOOSCAREDTOMOVE printstring STRINGID_MONTOOSCAREDTOMOVE
waitmessage 0x40 waitmessage 0x40
playanimation BS_ATTACKER, B_ANIM_MON_SCARED, NULL playanimation BS_ATTACKER, B_ANIM_MON_SCARED, NULL
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
gUnknown_81D9192:: BattleScript_GhostGetOutGetOut::
printstring STRINGID_GHOSTGETOUTGETOUT printstring STRINGID_GHOSTGETOUTGETOUT
playanimation BS_ATTACKER, B_ANIM_GHOST_GET_OUT, NULL playanimation BS_ATTACKER, B_ANIM_GHOST_GET_OUT, NULL
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
gUnknown_81D91A1:: BattleScript_SilphScopeUnveiled::
pause 0x20 pause 0x20
printstring STRINGID_SILPHSCOPEUNVEILED printstring STRINGID_SILPHSCOPEUNVEILED
waitstate waitstate
include/battle_scripts.h
+3 -3
View File
@@ -216,8 +216,8 @@ extern const u8 BattleScript_RunByUsingItem[];
extern const u8 BattleScript_ActionWatchesCarefully[]; extern const u8 BattleScript_ActionWatchesCarefully[];
extern const u8 BattleScript_ActionGetNear[]; extern const u8 BattleScript_ActionGetNear[];
extern const u8 BattleScript_ActionThrowPokeblock[]; extern const u8 BattleScript_ActionThrowPokeblock[];
extern const u8 gUnknown_81D9192[]; extern const u8 BattleScript_GhostGetOutGetOut[];
extern const u8 gUnknown_81D9180[]; extern const u8 BattleScript_TooScaredToMove[];
extern const u8 BattleScript_IntimidateActivates[]; extern const u8 BattleScript_IntimidateActivates[];
extern const u8 BattleScript_IntimidateActivatesEnd3[]; extern const u8 BattleScript_IntimidateActivatesEnd3[];
extern const u8 BattleScript_IgnoresWhileAsleep[]; extern const u8 BattleScript_IgnoresWhileAsleep[];
@@ -227,7 +227,7 @@ extern const u8 BattleScript_FlushMessageBox[];
extern const u8 BattleScript_SpikesOnFaintedBattler[]; extern const u8 BattleScript_SpikesOnFaintedBattler[];
extern const u8 BattleScript_GhostBallDodge[]; extern const u8 BattleScript_GhostBallDodge[];
extern const u8 BattleScript_OldMan_Pokedude_CaughtMessage[]; extern const u8 BattleScript_OldMan_Pokedude_CaughtMessage[];
extern const u8 gUnknown_81D91A1[]; // knizz: silph scope unveil extern const u8 BattleScript_SilphScopeUnveiled[]; // knizz: silph scope unveil
extern const u8 BattleScript_BattleTowerTrainerBattleWon[]; extern const u8 BattleScript_BattleTowerTrainerBattleWon[];
extern const u8 *const gBattleScriptsForMoveEffects[]; extern const u8 *const gBattleScriptsForMoveEffects[];
src/battle_main.c
+1 -1
View File
@@ -2677,7 +2677,7 @@ static void BattleIntroPrintWildMonAttacked(void)
if ((gBattleTypeFlags & (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_GHOST)) == (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_GHOST)) if ((gBattleTypeFlags & (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_GHOST)) == (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_GHOST))
{ {
gBattleScripting.battler = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); gBattleScripting.battler = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
BattleScriptExecute(gUnknown_81D91A1); BattleScriptExecute(BattleScript_SilphScopeUnveiled);
} }
} }
} }
src/battle_util.c
+2 -2
View File
@@ -1385,9 +1385,9 @@ u8 AtkCanceller_UnableToUseMove(void)
if ((gBattleTypeFlags & (BATTLE_TYPE_GHOST | BATTLE_TYPE_LEGENDARY)) == BATTLE_TYPE_GHOST) if ((gBattleTypeFlags & (BATTLE_TYPE_GHOST | BATTLE_TYPE_LEGENDARY)) == BATTLE_TYPE_GHOST)
{ {
if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER)
gBattlescriptCurrInstr = gUnknown_81D9180; gBattlescriptCurrInstr = BattleScript_TooScaredToMove;
else else
gBattlescriptCurrInstr = gUnknown_81D9192; gBattlescriptCurrInstr = BattleScript_GhostGetOutGetOut;
gBattleCommunication[MULTISTRING_CHOOSER] = 0; gBattleCommunication[MULTISTRING_CHOOSER] = 0;
effect = 1; effect = 1;
} }