diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-14 11:36:28 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-14 11:36:28 +0200 |
| commit | 455202eca00fd1b51e9ba8b75434d97ae5c750a8 (patch) | |
| tree | 153b1b85ae6864fec7bf880d9dd90fe6ef9a55c6 /asm/fldeff_cut.s | |
| parent | 14e41d6c508e5c425dff8f2c4933ae4c8b7ab762 (diff) | |
| parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) | |
Merge branch 'master' into decompile_rom3
Diffstat (limited to 'asm/fldeff_cut.s')
| -rwxr-xr-x | asm/fldeff_cut.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s index 7f67185a9..e31bf22e2 100755 --- a/asm/fldeff_cut.s +++ b/asm/fldeff_cut.s @@ -385,7 +385,7 @@ hm2_ruin_valley: @ 80D3A50 movs r0, 0x1 bl FieldEffectStart bl brm_get_pokemon_selection - ldr r1, =gFieldEffectSpawnParams + ldr r1, =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] @@ -421,7 +421,7 @@ sub_80D3A6C: @ 80D3A6C sub_80D3A9C: @ 80D3A9C push {lr} bl brm_get_pokemon_selection - ldr r1, =gFieldEffectSpawnParams + ldr r1, =gFieldEffectArguments lsls r0, 24 lsrs r0, 24 str r0, [r1] |