diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-06 18:32:17 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-06 18:32:17 -0500 |
| commit | 4cad26157e132753b9024dcc4b1cdc1d65f548f8 (patch) | |
| tree | f382721e0ec85377816f1eb89c257551fda6782b | |
| parent | f14f13b31269d4e0a537b20c53c766314bab0f86 (diff) | |
Rename ghost battle scripts
| -rw-r--r-- | data/battle_scripts_1.s | 6 | ||||
| -rw-r--r-- | include/battle_scripts.h | 6 | ||||
| -rw-r--r-- | src/battle_main.c | 2 | ||||
| -rw-r--r-- | src/battle_util.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 1eeae3a09..c4b0117a5 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3816,18 +3816,18 @@ BattleScript_TargetPRLZHeal:: updatestatusicon BS_TARGET return -gUnknown_81D9180:: +BattleScript_TooScaredToMove:: printstring STRINGID_MONTOOSCAREDTOMOVE waitmessage 0x40 playanimation BS_ATTACKER, B_ANIM_MON_SCARED, NULL goto BattleScript_MoveEnd -gUnknown_81D9192:: +BattleScript_GhostGetOutGetOut:: printstring STRINGID_GHOSTGETOUTGETOUT playanimation BS_ATTACKER, B_ANIM_GHOST_GET_OUT, NULL goto BattleScript_MoveEnd -gUnknown_81D91A1:: +BattleScript_SilphScopeUnveiled:: pause 0x20 printstring STRINGID_SILPHSCOPEUNVEILED waitstate diff --git a/include/battle_scripts.h b/include/battle_scripts.h index 361fff495..2a06f2425 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -216,8 +216,8 @@ extern const u8 BattleScript_RunByUsingItem[]; extern const u8 BattleScript_ActionWatchesCarefully[]; extern const u8 BattleScript_ActionGetNear[]; extern const u8 BattleScript_ActionThrowPokeblock[]; -extern const u8 gUnknown_81D9192[]; -extern const u8 gUnknown_81D9180[]; +extern const u8 BattleScript_GhostGetOutGetOut[]; +extern const u8 BattleScript_TooScaredToMove[]; extern const u8 BattleScript_IntimidateActivates[]; extern const u8 BattleScript_IntimidateActivatesEnd3[]; extern const u8 BattleScript_IgnoresWhileAsleep[]; @@ -227,7 +227,7 @@ extern const u8 BattleScript_FlushMessageBox[]; extern const u8 BattleScript_SpikesOnFaintedBattler[]; extern const u8 BattleScript_GhostBallDodge[]; 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 *const gBattleScriptsForMoveEffects[]; diff --git a/src/battle_main.c b/src/battle_main.c index 8852fa188..14b191e52 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -2677,7 +2677,7 @@ static void BattleIntroPrintWildMonAttacked(void) if ((gBattleTypeFlags & (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_GHOST)) == (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_GHOST)) { gBattleScripting.battler = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); - BattleScriptExecute(gUnknown_81D91A1); + BattleScriptExecute(BattleScript_SilphScopeUnveiled); } } } diff --git a/src/battle_util.c b/src/battle_util.c index de6419ecf..b415f6550 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -1385,9 +1385,9 @@ u8 AtkCanceller_UnableToUseMove(void) if ((gBattleTypeFlags & (BATTLE_TYPE_GHOST | BATTLE_TYPE_LEGENDARY)) == BATTLE_TYPE_GHOST) { if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) - gBattlescriptCurrInstr = gUnknown_81D9180; + gBattlescriptCurrInstr = BattleScript_TooScaredToMove; else - gBattlescriptCurrInstr = gUnknown_81D9192; + gBattlescriptCurrInstr = BattleScript_GhostGetOutGetOut; gBattleCommunication[MULTISTRING_CHOOSER] = 0; effect = 1; } |