diff options
| -rwxr-xr-x | .travis/upload_symbols.sh | 2 | ||||
| -rw-r--r-- | maps/VictoryRoad.asm | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/.travis/upload_symbols.sh b/.travis/upload_symbols.sh index c066b67a5..c4e03e8e1 100755 --- a/.travis/upload_symbols.sh +++ b/.travis/upload_symbols.sh @@ -9,4 +9,4 @@ cd symbols cp ../*.sym . git add *.sym git -c user.name='travis' -c user.email='travis@travis-ci.org' commit -m "$commit_message" -git push -f -q https://Rangi42:$GITHUB_API_KEY@github.com/pret/pokecrystal symbols &>/dev/null +git push -f -q https://pokepret:$GITHUB_API_KEY@github.com/pret/pokecrystal symbols &>/dev/null diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 69f782762..7b0e8495e 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -26,9 +26,9 @@ VictoryRoadRivalLeft: 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 @@ VictoryRoadRivalRight: 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 @@ VictoryRoadHiddenMaxPotion: VictoryRoadHiddenFullHeal: hiddenitem FULL_HEAL, EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL -MovementData_0x74539: +VictoryRoadRivalBattleApproachMovement1: step LEFT step LEFT step LEFT @@ -126,7 +126,7 @@ MovementData_0x74539: step UP step_end -MovementData_0x74542: +VictoryRoadRivalBattleApproachMovement2: step UP step UP step LEFT @@ -138,7 +138,7 @@ MovementData_0x74542: step UP step_end -MovementData_0x7454c: +VictoryRoadRivalBattleExitMovement1: step DOWN step DOWN step RIGHT @@ -149,7 +149,7 @@ MovementData_0x7454c: step RIGHT step_end -MovementData_0x74555: +VictoryRoadRivalBattleExitMovement2: step DOWN step DOWN step RIGHT |