Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename the object_struct field labels and constants (#1005)

Browse Source 
Fixes #990
This commit is contained in:
Rangi
2022-09-12 09:15:44 -04:00
committed by GitHub
parent 4c239a6f65
commit 41d5ea0482
30 changed files with 442 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
engine/overworld/movement.asm
View File

@@ -134,7 +134,7 @@ Movement_step_dig:
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], STEP_TYPE_SLEEP
ld hl, OBJECT_DIRECTION_WALKING
ld hl, OBJECT_WALKING
add hl, bc
ld [hl], STANDING
ret
@@ -150,7 +150,7 @@ Movement_return_dig:
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], a
ld hl, OBJECT_DIRECTION_WALKING
ld hl, OBJECT_WALKING
add hl, bc
ld [hl], STANDING
ld hl, OBJECT_STEP_TYPE
@@ -190,18 +190,18 @@ Movement_fish_cast_rod:
ret
Movement_step_loop:
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
ld hl, OBJECT_MOVEMENT_INDEX
add hl, bc
ld [hl], $0
jp ContinueReadingMovement
Movement_step_end:
call RestoreDefaultMovement
ld hl, OBJECT_MOVEMENTTYPE
ld hl, OBJECT_MOVEMENT_TYPE
add hl, bc
ld [hl], a
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
ld hl, OBJECT_MOVEMENT_INDEX
add hl, bc
ld [hl], $0
@@ -215,11 +215,11 @@ Movement_step_end:
Movement_48:
call RestoreDefaultMovement
ld hl, OBJECT_MOVEMENTTYPE
ld hl, OBJECT_MOVEMENT_TYPE
add hl, bc
ld [hl], a
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
ld hl, OBJECT_MOVEMENT_INDEX
add hl, bc
ld [hl], $0
@@ -314,7 +314,7 @@ Movement_step_sleep_common:
add hl, bc
ld [hl], OBJECT_ACTION_STAND
ld hl, OBJECT_DIRECTION_WALKING
ld hl, OBJECT_WALKING
add hl, bc
ld [hl], STANDING
ret
@@ -333,7 +333,7 @@ Movement_step_bump:
add hl, bc
ld [hl], OBJECT_ACTION_BUMP
ld hl, OBJECT_DIRECTION_WALKING
ld hl, OBJECT_WALKING
add hl, bc
ld [hl], STANDING
ret
@@ -352,7 +352,7 @@ Movement_tree_shake:
add hl, bc
ld [hl], OBJECT_ACTION_WEIRD_TREE
ld hl, OBJECT_DIRECTION_WALKING
ld hl, OBJECT_WALKING
add hl, bc
ld [hl], STANDING
ret
@@ -426,7 +426,7 @@ Movement_turn_head_right:
jr TurnHead
TurnHead:
ld hl, OBJECT_FACING
ld hl, OBJECT_DIRECTION
add hl, bc
ld [hl], a
@@ -434,7 +434,7 @@ TurnHead:
add hl, bc
ld [hl], OBJECT_ACTION_STAND
ld hl, OBJECT_DIRECTION_WALKING
ld hl, OBJECT_WALKING
add hl, bc
ld [hl], STANDING
ret
@@ -668,7 +668,7 @@ NormalStep:
add hl, bc
ld [hl], OBJECT_ACTION_STEP
ld hl, OBJECT_NEXT_TILE
ld hl, OBJECT_TILE
add hl, bc
ld a, [hl]
call CheckSuperTallGrassTile
@@ -747,7 +747,7 @@ SlideStep:
JumpStep:
call InitStep
ld hl, OBJECT_1F
ld hl, OBJECT_JUMP_HEIGHT
add hl, bc
ld [hl], $0