diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-31 13:42:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 13:42:41 -0400 |
| commit | 4cf09577950db22d7f0acf6ede45b8dca1c97156 (patch) | |
| tree | cb094078122b217fc67e2285614b79c6e83eaf88 /data/battle_scripts_2.s | |
| parent | c5839905a1259fd7e843c0ffa1ce2470d40b76ae (diff) | |
| parent | bb56d4a3f4cab33f899646e0630282fc6176a9c9 (diff) | |
Merge pull request #356 from GriffinRichards/rename-songs
Give songs meaningful english names
Diffstat (limited to 'data/battle_scripts_2.s')
| -rw-r--r-- | data/battle_scripts_2.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 288b0438d..eab0bd225 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -134,7 +134,7 @@ BattleScript_PlayerUseItem:: BattleScript_AIUseFullRestoreOrHpHeal:: printstring STRINGID_EMPTYSTRING3 pause 48 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 64 useitemonopponent @@ -150,7 +150,7 @@ BattleScript_AIUseFullRestoreOrHpHeal:: BattleScript_AIUseStatRestore:: printstring STRINGID_EMPTYSTRING3 pause 48 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 64 useitemonopponent @@ -163,7 +163,7 @@ BattleScript_AIUseStatRestore:: BattleScript_AIUseXstat:: printstring STRINGID_EMPTYSTRING3 pause 48 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 64 useitemonopponent @@ -175,7 +175,7 @@ BattleScript_AIUseXstat:: BattleScript_AIUseGuardSpec:: printstring STRINGID_EMPTYSTRING3 pause 48 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 64 useitemonopponent @@ -185,7 +185,7 @@ BattleScript_AIUseGuardSpec:: finishaction BattleScript_UseFluffyTail:: - playse SE_NIGERU + playse SE_FLEE setbyte gBattleOutcome, B_OUTCOME_RAN finishturn @@ -199,7 +199,7 @@ BattleScript_UsePokeFlute:: BattleScript_PokeFluteWakeUp:: printstring STRINGID_POKEFLUTE waitmessage 64 - fanfare MUS_POKEFUE + fanfare MUS_POKE_FLUTE waitfanfare BS_ATTACKER printstring STRINGID_MONHEARINGFLUTEAWOKE waitmessage 64 |