diff options
Diffstat (limited to 'asm/field_player_avatar.s')
| -rw-r--r-- | asm/field_player_avatar.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index 9f47c0a55..34ff54f61 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -1522,7 +1522,7 @@ PlayerAvatarTransition_Surfing: @ 808B4D8 bl FieldObjectTurn movs r0, 0x8 bl SetPlayerAvatarStateMask - ldr r1, =gFieldEffectSpawnParams + ldr r1, =gFieldEffectArguments movs r2, 0x10 ldrsh r0, [r4, r2] str r0, [r1] @@ -3517,7 +3517,7 @@ _0808C3F0: lsrs r1, 24 adds r0, r4, 0 bl FieldObjectSetSpecialAnim - ldr r2, =gFieldEffectSpawnParams + ldr r2, =gFieldEffectArguments movs r1, 0x10 ldrsh r0, [r4, r1] str r0, [r2] @@ -3897,7 +3897,7 @@ sub_808C750: @ 808C750 lsrs r4, 24 bl ScriptContext2_Enable bl sav1_reset_battle_music_maybe - bl sub_8085898 + bl Overworld_ChangeMusicToDefault ldr r2, =gPlayerAvatar ldrb r1, [r2] movs r0, 0xF7 @@ -4858,7 +4858,7 @@ fishF: @ 808CF2C ldr r0, =gPlayerAvatar strb r1, [r0, 0x6] bl ScriptContext2_Disable - bl sub_809757C + bl UnfreezeMapObjects movs r0, 0 movs r1, 0x1 bl sub_8197434 |