summaryrefslogtreecommitdiff
path: root/asm/fldeff_teleport.s
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-10-14 11:36:28 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-10-14 11:36:28 +0200
commit455202eca00fd1b51e9ba8b75434d97ae5c750a8 (patch)
tree153b1b85ae6864fec7bf880d9dd90fe6ef9a55c6 /asm/fldeff_teleport.s
parent14e41d6c508e5c425dff8f2c4933ae4c8b7ab762 (diff)
parent0d38d443b561f9baaae12324712503dfccaf01ea (diff)
Merge branch 'master' into decompile_rom3
Diffstat (limited to 'asm/fldeff_teleport.s')
-rw-r--r--asm/fldeff_teleport.s2
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/fldeff_teleport.s b/asm/fldeff_teleport.s
index e4f4bce42..d77e29dd2 100644
--- a/asm/fldeff_teleport.s
+++ b/asm/fldeff_teleport.s
@@ -39,7 +39,7 @@ hm_teleport_run_dp02scr: @ 817C8FC
movs r0, 0x3F
bl FieldEffectStart
bl brm_get_pokemon_selection
- ldr r1, =gFieldEffectSpawnParams
+ ldr r1, =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]