ref: 73d20afd15d625889d4cb6617833bafd0316f12b
parent: 61847b3596807fd5789c800139af624bcac32e7a
author: Rangi <[email protected]>
date: Mon Jun 22 13:25:42 EDT 2020
Use pokepret account for committing to symbols branch
--- a/.travis/upload_symbols.sh
+++ b/.travis/upload_symbols.sh
@@ -9,4 +9,4 @@
cp ../*.sym .
git add *.sym
git -c user.name='travis' -c user.email='[email protected]' commit -m "$commit_message"
-git push -f -q https://Rangi42:[email protected]/pret/pokecrystal symbols &>/dev/null
+git push -f -q https://pokepret:[email protected]/pret/pokecrystal symbols &>/dev/null
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -26,9 +26,9 @@
special FadeOutMusic
pause 15
appear VICTORYROAD_SILVER
- applymovement VICTORYROAD_SILVER, MovementData_0x74539
+ applymovement VICTORYROAD_SILVER, VictoryRoadRivalBattleApproachMovement1
scall VictoryRoadRivalNext
- applymovement VICTORYROAD_SILVER, MovementData_0x7454c
+ applymovement VICTORYROAD_SILVER, VictoryRoadRivalBattleExitMovement1
disappear VICTORYROAD_SILVER
setscene SCENE_FINISHED
playmapmusic
@@ -40,9 +40,9 @@
special FadeOutMusic
pause 15
appear VICTORYROAD_SILVER
- applymovement VICTORYROAD_SILVER, MovementData_0x74542
+ applymovement VICTORYROAD_SILVER, VictoryRoadRivalBattleApproachMovement2
scall VictoryRoadRivalNext
- applymovement VICTORYROAD_SILVER, MovementData_0x74555
+ applymovement VICTORYROAD_SILVER, VictoryRoadRivalBattleExitMovement2
disappear VICTORYROAD_SILVER
setscene SCENE_FINISHED
playmapmusic
@@ -115,7 +115,7 @@
VictoryRoadHiddenFullHeal:
hiddenitem FULL_HEAL, EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL
-MovementData_0x74539:
+VictoryRoadRivalBattleApproachMovement1:
step LEFT
step LEFT
step LEFT
@@ -126,7 +126,7 @@
step UP
step_end
-MovementData_0x74542:
+VictoryRoadRivalBattleApproachMovement2:
step UP
step UP
step LEFT
@@ -138,7 +138,7 @@
step UP
step_end
-MovementData_0x7454c:
+VictoryRoadRivalBattleExitMovement1:
step DOWN
step DOWN
step RIGHT
@@ -149,7 +149,7 @@
step RIGHT
step_end
-MovementData_0x74555:
+VictoryRoadRivalBattleExitMovement2:
step DOWN
step DOWN
step RIGHT