aboutsummaryrefslogtreecommitdiffstats
path: root/engine/overworld
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-09-29 22:41:34 -0400
committerGitHub <noreply@github.com>2017-09-29 22:41:34 -0400
commit5c2419383118280465a89657fed34ed6562f2981 (patch)
tree4844873fcd027d8f238be629d283663d5fcafc9b /engine/overworld
parentAdd Gen 3 disassemblies. (diff)
parentUpdate Travis configuration to use rgbds 0.3.3 (diff)
downloadpokeyellow-5c2419383118280465a89657fed34ed6562f2981.tar.gz
pokeyellow-5c2419383118280465a89657fed34ed6562f2981.tar.xz
pokeyellow-5c2419383118280465a89657fed34ed6562f2981.zip
Merge pull request #167 from Pokechu22/rgbds-0.3.3
Update for RGBDS 0.3.3
Diffstat (limited to 'engine/overworld')
-rw-r--r--engine/overworld/player_state.asm2
-rwxr-xr-xengine/overworld/ssanne.asm2
2 files changed, 2 insertions, 2 deletions
diff --git a/engine/overworld/player_state.asm b/engine/overworld/player_state.asm
index 79f755b9..b8d734f2 100644
--- a/engine/overworld/player_state.asm
+++ b/engine/overworld/player_state.asm
@@ -103,7 +103,7 @@ IsPlayerFacingEdgeOfMap:
ld c, a
ld de, .asm_c41e
push de
- jp [hl]
+ jp hl
.asm_c41e
pop bc
pop de
diff --git a/engine/overworld/ssanne.asm b/engine/overworld/ssanne.asm
index 712c53ed..ea4747ce 100755
--- a/engine/overworld/ssanne.asm
+++ b/engine/overworld/ssanne.asm
@@ -16,7 +16,7 @@ AnimateBoulderDust:
ld bc, .returnAddress
push bc
ld c, 4
- jp [hl]
+ jp hl
.returnAddress
ld a, [rOBP1]
xor %01100100