diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-22 17:25:31 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-22 17:25:31 -0400 |
| commit | 3aba8710fa7740415fd2c37803e9358f6c9d820f (patch) | |
| tree | 0bc8e0a1c95a78330c448cbb16ed13e05a3ca543 | |
| parent | 659550583130eb0991a8e09a080480ef5c48940c (diff) | |
Use pokepret account for committing to symbols branch
| -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 ede8790a..592c7787 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/pokegold symbols &>/dev/null +git push -f -q https://pokepret:$GITHUB_API_KEY@github.com/pret/pokegold symbols &>/dev/null diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 115bc492..834e0d76 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_0x109a61 + applymovement VICTORYROAD_SILVER, VictoryRoadRivalBattleApproachMovement1 scall VictoryRoadRivalNext - applymovement VICTORYROAD_SILVER, MovementData_0x109a74 + 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_0x109a6a + applymovement VICTORYROAD_SILVER, VictoryRoadRivalBattleApproachMovement2 scall VictoryRoadRivalNext - applymovement VICTORYROAD_SILVER, MovementData_0x109a7d + 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_0x109a61: +VictoryRoadRivalBattleApproachMovement1: step LEFT step LEFT step LEFT @@ -126,7 +126,7 @@ MovementData_0x109a61: step UP step_end -MovementData_0x109a6a: +VictoryRoadRivalBattleApproachMovement2: step UP step UP step LEFT @@ -138,7 +138,7 @@ MovementData_0x109a6a: step UP step_end -MovementData_0x109a74: +VictoryRoadRivalBattleExitMovement1: step DOWN step DOWN step RIGHT @@ -149,7 +149,7 @@ MovementData_0x109a74: step RIGHT step_end -MovementData_0x109a7d: +VictoryRoadRivalBattleExitMovement2: step DOWN step DOWN step RIGHT |