diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-20 22:44:01 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-20 22:44:01 -0400 |
| commit | 273324e7875e63e69fc4ce77423a9c5b4acc9862 (patch) | |
| tree | be46690f71a026b599dfdb37e47828109f5cd04a | |
| parent | fcaaf45da56148741d8d300fe013c5aae7e19f35 (diff) | |
pushd/popd are bash-only
| -rwxr-xr-x | .travis/upload_symbols.sh | 7 | ||||
| -rw-r--r-- | engine/battle/core.asm | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/.travis/upload_symbols.sh b/.travis/upload_symbols.sh index 1d8605f84..c066b67a5 100755 --- a/.travis/upload_symbols.sh +++ b/.travis/upload_symbols.sh @@ -3,13 +3,10 @@ set -e commit_message=$(git log -1 --pretty=%B) -mkdir symbols -pushd symbols +git clone -b symbols https://github.com/pret/pokecrystal symbols +cd symbols -git clone -b symbols https://github.com/pret/pokecrystal 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 - -popd diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 282dd8049..e9ef9dc26 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -5415,7 +5415,7 @@ MoveSelectionScreen: dec a jr nz, .interpret_joypad hlcoord 11, 14 - ld de, .string_3e61c + ld de, .empty_string call PlaceString jr .interpret_joypad @@ -5511,7 +5511,7 @@ MoveSelectionScreen: call SafeLoadTempTilemapToTilemap jp MoveSelectionScreen -.string_3e61c +.empty_string db "@" .pressed_up |