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/TeamRocketBaseB2F.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'maps/TeamRocketBaseB2F.asm') 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 -- cgit v1.2.3 From 1fa6aecbfcc81b8794ca10e6d88837b1645f95e1 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sat, 14 May 2016 13:46:14 -0400 Subject: Unify directional movement macros --- maps/TeamRocketBaseB2F.asm | 250 ++++++++++++++++++++++----------------------- 1 file changed, 125 insertions(+), 125 deletions(-) (limited to 'maps/TeamRocketBaseB2F.asm') diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 88ceff757..3091a0233 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -367,204 +367,204 @@ TeamRocketBaseB2FHiddenFullHeal: MovementData_0x6d212: - step_right - step_right - step_right - step_right - step_right - step_right + step RIGHT + step RIGHT + step RIGHT + step RIGHT + step RIGHT + step RIGHT step_end MovementData_0x6d219: - step_right - step_right - step_right - step_right - step_right + step RIGHT + step RIGHT + step RIGHT + step RIGHT + step RIGHT step_end MovementData_0x6d21f: - step_down - step_down - step_down - turn_head_right + step DOWN + step DOWN + step DOWN + turn_head RIGHT step_end MovementData_0x6d224: - big_step_left - big_step_left - big_step_up - big_step_up - big_step_up - big_step_left - big_step_left - big_step_left - big_step_left - turn_head_down + big_step LEFT + big_step LEFT + big_step UP + big_step UP + big_step UP + big_step LEFT + big_step LEFT + big_step LEFT + big_step LEFT + turn_head DOWN step_end MovementData_0x6d22f: - big_step_left - big_step_left - big_step_up - big_step_up - big_step_left - big_step_left + big_step LEFT + big_step LEFT + big_step UP + big_step UP + big_step LEFT + big_step LEFT step_end MovementData_0x6d236: - big_step_right - big_step_right - big_step_right - big_step_right + big_step RIGHT + big_step RIGHT + big_step RIGHT + big_step RIGHT step_end MovementData_0x6d23b: fix_facing db $39 ; movement - jump_step_right + jump_step RIGHT db $38 ; movement remove_fixed_facing step_end MovementData_0x6d241: - slow_step_down - turn_head_left + slow_step DOWN + turn_head LEFT step_end MovementData_0x6d244: - step_right - step_right - step_right + step RIGHT + step RIGHT + step RIGHT step_end MovementData_0x6d248: - big_step_left + big_step LEFT step_end MovementData_0x6d24a: - big_step_left + big_step LEFT step_end MovementData_0x6d24c: - big_step_left - big_step_up - turn_head_left + big_step LEFT + big_step UP + turn_head LEFT step_end MovementData_0x6d250: - step_right - step_right - turn_head_down + step RIGHT + step RIGHT + turn_head DOWN step_end MovementData_0x6d254: - step_up - step_up - step_up + step UP + step UP + step UP step_end MovementData_0x6d258: step_sleep 8 - step_left - step_left - turn_head_up + step LEFT + step LEFT + turn_head UP step_sleep 8 - step_right - step_right - step_right - step_right - turn_head_up + step RIGHT + step RIGHT + step RIGHT + step RIGHT + turn_head UP step_sleep 8 - step_left - step_left - turn_head_down + step LEFT + step LEFT + turn_head DOWN step_end MovementData_0x6d267: - step_right - step_right - step_right - step_right - step_up - step_up - step_up - step_up - step_up + step RIGHT + step RIGHT + step RIGHT + step RIGHT + step UP + step UP + step UP + step UP + step UP step_end MovementData_0x6d271: - step_up - step_left - step_left - step_left - step_left - turn_head_up + step UP + step LEFT + step LEFT + step LEFT + step LEFT + turn_head UP step_end MovementData_0x6d278: - step_left + step LEFT step_end MovementData_0x6d27a: - step_down - step_down - step_down - step_down - step_down - step_left - step_left - step_left + step DOWN + step DOWN + step DOWN + step DOWN + step DOWN + step LEFT + step LEFT + step LEFT step_end MovementData_0x6d283: - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_left + step DOWN + step DOWN + step LEFT + step LEFT + step LEFT + step LEFT + step LEFT + step LEFT step_end MovementData_0x6d28c: - step_right - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right + step RIGHT + step RIGHT + step DOWN + step DOWN + step DOWN + step DOWN + step DOWN + step DOWN + step RIGHT + step RIGHT + step RIGHT + step RIGHT step_end MovementData_0x6d299: - step_right - step_right - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right + step RIGHT + step RIGHT + step DOWN + step DOWN + step DOWN + step DOWN + step RIGHT + step RIGHT + step RIGHT + step RIGHT step_end MovementData_0x6d2a4: - step_right - step_right - step_down - step_down - step_right - step_right - step_right - step_right + step RIGHT + step RIGHT + step DOWN + step DOWN + step RIGHT + step RIGHT + step RIGHT + step RIGHT step_end UnknownText_0x6d2ad: -- cgit v1.2.3