Merge pull request #330 from PikalaxALT/scriptmacrorenaming

Scriptmacrorenaming

1 files changed, 33 insertions, 33 deletions

diff --git a/engine/movement.asm b/engine/movement.asm
index 86a2eb6fb..ca3ac55b5 100644
--- a/engine/movement.asm
+++ b/engine/movement.asm
@@ -3,10 +3,10 @@ MovementPointers: ; 5075
 	dw Movement_turn_head_up          ; 01
 	dw Movement_turn_head_left        ; 02
 	dw Movement_turn_head_right       ; 03
-	dw Movement_half_step_down        ; 04
-	dw Movement_half_step_up          ; 05
-	dw Movement_half_step_left        ; 06
-	dw Movement_half_step_right       ; 07
+	dw Movement_turn_step_down        ; 04
+	dw Movement_turn_step_up          ; 05
+	dw Movement_turn_step_left        ; 06
+	dw Movement_turn_step_right       ; 07
 	dw Movement_slow_step_down        ; 08
 	dw Movement_slow_step_up          ; 09
 	dw Movement_slow_step_left        ; 0a
@@ -88,7 +88,7 @@ MovementPointers: ; 5075
 	dw Movement_56                    ; 56
 	dw Movement_rock_smash            ; 57
 	dw Movement_return_dig            ; 58
-	dw Movement_59                    ; 59
+	dw Movement_skyfall_top       ; 59
 ; 5129
 
 
@@ -113,10 +113,10 @@ Movement_skyfall: ; 5137
 	ret
 ; 513e
 
-Movement_59: ; 513e
+Movement_skyfall_top: ; 513e
 	ld hl, OBJECT_STEP_TYPE
 	add hl, bc
-	ld [hl], STEP_TYPE_19
+	ld [hl], STEP_TYPE_SKYFALL_TOP
 	ret
 ; 5145
 
@@ -130,7 +130,7 @@ Movement_step_dig: ; 5145
 	ld hl, OBJECT_ACTION
 	add hl, bc
 	ld [hl], PERSON_ACTION_SPIN
-	call GetMovementByte
+	call JumpMovementPointer
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
 	ld [hl], a
@@ -150,7 +150,7 @@ Movement_return_dig: ; 516a
 	ld hl, OBJECT_STEP_FRAME
 	add hl, bc
 	ld [hl], a
-	call GetMovementByte
+	call JumpMovementPointer
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
 	ld [hl], a
@@ -174,7 +174,7 @@ Movement_fish_got_bite: ; 5189
 ; 5196
 
 Movement_rock_smash: ; 5196
-	call GetMovementByte
+	call JumpMovementPointer
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
 	ld [hl], a
@@ -193,7 +193,7 @@ Movement_fish_cast_rod: ; 51ab
 	ld [hl], PERSON_ACTION_FISHING
 	ld hl, OBJECT_STEP_TYPE
 	add hl, bc
-	ld [hl], STEP_TYPE_STANDING
+	ld [hl], STEP_TYPE_SLEEP
 	ret
 ; 51b8
 
@@ -219,7 +219,7 @@ Movement_step_end: ; 51c1
 
 	ld hl, OBJECT_STEP_TYPE
 	add hl, bc
-	ld [hl], STEP_TYPE_STANDING
+	ld [hl], STEP_TYPE_SLEEP
 	ret
 ; 51db
 
@@ -233,7 +233,7 @@ Movement_48: ; 51db
 	add hl, bc
 	ld [hl], $0
 
-	call GetMovementByte
+	call JumpMovementPointer
 	ld hl, OBJECT_STEP_DURATION
 	add hl, bc
 	ld [hl], a
@@ -248,7 +248,7 @@ Movement_48: ; 51db
 ; 51fd
 
 Movement_remove_person: ; 51fd
-	call Function4357
+	call DeleteMapObject
 	ld hl, wObjectFollow_Leader
 	ld a, [hMapObjectIndexBuffer]
 	cp [hl]
@@ -311,7 +311,7 @@ Movement_step_sleep: ; 5242
 ; parameters:
 ;	duration (DecimalParam)
 
-	call GetMovementByte
+	call JumpMovementPointer
 	jr Movement_step_sleep_common
 
 Movement_step_sleep_common: ; 5247
@@ -429,7 +429,7 @@ Movement_step_shake: ; 52d5
 ; parameters:
 ;	displacement (DecimalParam)
 
-	call GetMovementByte
+	call JumpMovementPointer
 	call ShakeScreen
 	jp ContinueReadingMovement
 ; 52de
@@ -709,24 +709,24 @@ Movement_fast_jump_step_right: ; 53eb
 ; 53f0
 
 
-Movement_half_step_down: ; 53f0
+Movement_turn_step_down: ; 53f0
 	ld a, OW_DOWN
-	jr HalfStep
+	jr TurnStep
 
-Movement_half_step_up: ; 53f4
+Movement_turn_step_up: ; 53f4
 	ld a, OW_UP
-	jr HalfStep
+	jr TurnStep
 
-Movement_half_step_left: ; 53f8
+Movement_turn_step_left: ; 53f8
 	ld a, OW_LEFT
-	jr HalfStep
+	jr TurnStep
 
-Movement_half_step_right: ; 53fc
+Movement_turn_step_right: ; 53fc
 	ld a, OW_RIGHT
-	jr HalfStep
+	jr TurnStep
 
-HalfStep: ; 5400
-	ld hl, OBJECT_29
+TurnStep: ; 5400
+	ld hl, OBJECT_29 ; new facing
 	add hl, bc
 	ld [hl], a
 
@@ -741,8 +741,8 @@ HalfStep: ; 5400
 ; 5412
 
 NormalStep: ; 5412
-	call Function4690
-	call Function463f
+	call InitStep
+	call UpdateTallGrassFlags
 	ld hl, OBJECT_ACTION
 	add hl, bc
 	ld [hl], PERSON_ACTION_STEP
@@ -778,8 +778,8 @@ NormalStep: ; 5412
 ; 5446
 
 TurningStep: ; 5446
-	call Function4690
-	call Function463f
+	call InitStep
+	call UpdateTallGrassFlags
 
 	ld hl, OBJECT_ACTION
 	add hl, bc
@@ -804,8 +804,8 @@ TurningStep: ; 5446
 
 
 SlideStep: ; 5468
-	call Function4690
-	call Function463f
+	call InitStep
+	call UpdateTallGrassFlags
 
 	ld hl, OBJECT_ACTION
 	add hl, bc
@@ -830,7 +830,7 @@ SlideStep: ; 5468
 
 
 JumpStep: ; 548a
-	call Function4690
+	call InitStep
 	ld hl, OBJECT_31
 	add hl, bc
 	ld [hl], $0