From 3108c9fa6a265a7ecbac6fa2aaa458025f5aeead Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sat, 14 May 2016 12:28:00 -0400 Subject: Unify step_sleep macro --- maps/CeruleanGym.asm | 4 ++-- maps/IlexForest.asm | 18 +++++++++--------- maps/OlivineLighthouse6F.asm | 6 +++--- maps/SlowpokeWellB1F.asm | 12 ++++++------ maps/TeamRocketBaseB2F.asm | 6 +++--- maps/TeamRocketBaseB3F.asm | 4 ++-- 6 files changed, 25 insertions(+), 25 deletions(-) (limited to 'maps') diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index ddadd6f9c..ad1f35acc 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -184,8 +184,8 @@ MovementData_0x1884eb: jump_step_up db $38 ; movement remove_fixed_facing - step_sleep_8 - step_sleep_8 + step_sleep 8 + step_sleep 8 step_down step_down step_end diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 7ac703e3f..248617e3c 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -578,17 +578,17 @@ MovementData_Farfetched_Pos5_Pos4_Up: MovementData_Farfetched_Pos5_Pos4_Right: big_step_right turn_head_up - step_sleep_1 + step_sleep 1 turn_head_down - step_sleep_1 + step_sleep 1 turn_head_up - step_sleep_1 + step_sleep 1 big_step_down big_step_down fix_facing jump_step_up - step_sleep_8 - step_sleep_8 + step_sleep 8 + step_sleep 8 remove_fixed_facing big_step_up big_step_up @@ -679,8 +679,8 @@ MovementData_Farfetched_Pos9_Pos10: big_step_left fix_facing jump_step_right - step_sleep_8 - step_sleep_8 + step_sleep 8 + step_sleep 8 remove_fixed_facing big_step_left big_step_left @@ -709,8 +709,8 @@ MovementData_Farfetched_Pos9_Pos8_Down: big_step_left fix_facing jump_step_right - step_sleep_8 - step_sleep_8 + step_sleep 8 + step_sleep 8 remove_fixed_facing big_step_right big_step_right diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index d1c6527c9..237dde33c 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -136,8 +136,8 @@ MovementData_0x60c68: slow_step_right slow_step_up slow_step_up - step_sleep_8 - step_sleep_8 + step_sleep 8 + step_sleep 8 step_end MovementData_0x60c70: @@ -158,7 +158,7 @@ MovementData_0x60c79: slow_step_up slow_step_up slow_step_up - step_sleep_8 + step_sleep 8 step_end UnknownText_0x60c81: diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index b905140f8..aef737454 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -132,15 +132,15 @@ KurtSlowpokeWellVictoryMovementData: step_left step_left step_up - step_sleep_8 - step_sleep_8 - step_sleep_8 + step_sleep 8 + step_sleep 8 + step_sleep 8 step_left step_up step_up - step_sleep_8 - step_sleep_8 - step_sleep_8 + step_sleep 8 + step_sleep 8 + step_sleep 8 turn_head_left step_end diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 01713758e..88ceff757 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -465,17 +465,17 @@ MovementData_0x6d254: step_end MovementData_0x6d258: - step_sleep_8 + step_sleep 8 step_left step_left turn_head_up - step_sleep_8 + step_sleep 8 step_right step_right step_right step_right turn_head_up - step_sleep_8 + step_sleep 8 step_left step_left turn_head_down diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 049559b51..5c98ba200 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -270,8 +270,8 @@ MovementData_0x6e147: fix_facing fast_jump_step_left remove_fixed_facing - step_sleep_8 - step_sleep_8 + step_sleep 8 + step_sleep 8 slow_step_right big_step_down big_step_down -- cgit v1.2.3