summaryrefslogtreecommitdiff
path: root/data/battle_scripts_1.s
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-08-20 18:02:00 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-08-20 19:06:14 -0400
commit30142411799650c17367ce4652269e8ecca7ceef (patch)
tree69a4b6b971c0df861bf549c64029317e1146ab99 /data/battle_scripts_1.s
parent6c34effda93c67a37895e79b684b31b3cb9a2a88 (diff)
Give songs meaningful english names
Diffstat (limited to 'data/battle_scripts_1.s')
-rw-r--r--data/battle_scripts_1.s14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index f0c0a7ea8..873425c63 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -3165,7 +3165,7 @@ BattleScript_Pausex20::
return
BattleScript_LevelUp::
- fanfare MUS_FANFA1
+ fanfare MUS_LEVEL_UP
printstring STRINGID_PKMNGREWTOLV
setbyte sLVLBOX_STATE, 0x0
drawlvlupbox
@@ -3193,7 +3193,7 @@ BattleScript_ForgotAndLearnedNewMove::
printstring STRINGID_ANDELLIPSIS
BattleScript_LearnedNewMove::
buffermovetolearn
- fanfare MUS_FANFA1
+ fanfare MUS_LEVEL_UP
printstring STRINGID_PKMNLEARNEDMOVE
waitmessage 0x40
updatechoicemoveonlvlup BS_ATTACKER
@@ -4459,9 +4459,9 @@ BattleScript_PalaceEndFlavorText::
BattleScript_ArenaTurnBeginning::
waitcry BS_ATTACKER
volumedown
- playse SE_HANTEI1
+ playse SE_ARENA_TIMEUP1
pause 0x8
- playse SE_HANTEI1
+ playse SE_ARENA_TIMEUP1
various14 BS_ATTACKER
arenajudmengtstring 8
arenawaitmessage 8
@@ -4471,7 +4471,7 @@ BattleScript_ArenaTurnBeginning::
end2
BattleScript_82DB8E0:: @ Unused battlescript
- playse SE_PINPON
+ playse SE_DING_DONG
various14 BS_ATTACKER
arenajudmengtstring BS_TARGET
arenawaitmessage BS_TARGET
@@ -4485,9 +4485,9 @@ BattleScript_ArenaDoJudgment::
makevisible BS_OPPONENT1
waitstate
volumedown
- playse SE_HANTEI1
+ playse SE_ARENA_TIMEUP1
pause 0x8
- playse SE_HANTEI1
+ playse SE_ARENA_TIMEUP1
pause 0x40
various14 BS_ATTACKER
arenajudmengtstring 1