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

52
engine/overworld/player_object.asm
View File

@@ -87,10 +87,10 @@ WriteObjectXY::
call CheckObjectVisibility
ret c
ld hl, OBJECT_NEXT_MAP_X
ld hl, OBJECT_MAP_X
add hl, bc
ld d, [hl]
ld hl, OBJECT_NEXT_MAP_Y
ld hl, OBJECT_MAP_Y
add hl, bc
ld e, [hl]
ldh a, [hMapObjectIndex]
@@ -103,7 +103,7 @@ RefreshPlayerCoords:
ld a, [wXCoord]
add 4
ld d, a
ld hl, wPlayerStandingMapX
ld hl, wPlayerMapX
sub [hl]
ld [hl], d
ld hl, wMapObjects + MAPOBJECT_X_COORD
@@ -114,7 +114,7 @@ RefreshPlayerCoords:
ld a, [wYCoord]
add 4
ld e, a
ld hl, wPlayerStandingMapY
ld hl, wPlayerMapY
sub [hl]
ld [hl], e
ld hl, wMapObjects + MAPOBJECT_Y_COORD
@@ -447,7 +447,7 @@ CopyTempObjectToObjectStruct:
add hl, de
ld [hl], STEP_TYPE_RESET
ld hl, OBJECT_FACING_STEP
ld hl, OBJECT_FACING
add hl, de
ld [hl], STANDING
@@ -467,7 +467,7 @@ CopyTempObjectToObjectStruct:
add hl, de
ld [hl], a
ld hl, OBJECT_NEXT_MAP_Y
ld hl, OBJECT_MAP_Y
add hl, de
ld [hl], a
@@ -486,7 +486,7 @@ CopyTempObjectToObjectStruct:
ld hl, OBJECT_INIT_X
add hl, de
ld [hl], a
ld hl, OBJECT_NEXT_MAP_X
ld hl, OBJECT_MAP_X
add hl, de
ld [hl], a
ld hl, wXCoord
@@ -557,19 +557,19 @@ TrainerWalkToPlayer:
call GetObjectStruct
; get last talked coords, load to bc
ld hl, OBJECT_NEXT_MAP_X
ld hl, OBJECT_MAP_X
add hl, bc
ld a, [hl]
ld hl, OBJECT_NEXT_MAP_Y
ld hl, OBJECT_MAP_Y
add hl, bc
ld c, [hl]
ld b, a
; get player coords, load to de
ld hl, OBJECT_NEXT_MAP_X
ld hl, OBJECT_MAP_X
add hl, de
ld a, [hl]
ld hl, OBJECT_NEXT_MAP_Y
ld hl, OBJECT_MAP_Y
add hl, de
ld e, [hl]
ld d, a
@@ -618,15 +618,15 @@ FollowNotExact::
ret c
; object 2 is now in bc, object 1 is now in de
ld hl, OBJECT_NEXT_MAP_X
ld hl, OBJECT_MAP_X
add hl, bc
ld a, [hl]
ld hl, OBJECT_NEXT_MAP_Y
ld hl, OBJECT_MAP_Y
add hl, bc
ld c, [hl]
ld b, a
ld hl, OBJECT_NEXT_MAP_X
ld hl, OBJECT_MAP_X
add hl, de
ld a, [hl]
cp b
@@ -640,7 +640,7 @@ FollowNotExact::
jr .continue
.same_x
ld hl, OBJECT_NEXT_MAP_Y
ld hl, OBJECT_MAP_Y
add hl, de
ld a, [hl]
cp c
@@ -653,7 +653,7 @@ FollowNotExact::
dec c
.continue
ld hl, OBJECT_NEXT_MAP_X
ld hl, OBJECT_MAP_X
add hl, de
ld [hl], b
ld a, b
@@ -666,7 +666,7 @@ FollowNotExact::
ld hl, OBJECT_SPRITE_X
add hl, de
ld [hl], a
ld hl, OBJECT_NEXT_MAP_Y
ld hl, OBJECT_MAP_Y
add hl, de
ld [hl], c
ld a, c
@@ -683,7 +683,7 @@ FollowNotExact::
ld hl, OBJECT_RANGE
add hl, de
ld [hl], a
ld hl, OBJECT_MOVEMENTTYPE
ld hl, OBJECT_MOVEMENT_TYPE
add hl, de
ld [hl], SPRITEMOVEDATA_FOLLOWNOTEXACT
ld hl, OBJECT_STEP_TYPE
@@ -721,10 +721,10 @@ GetRelativeFacing::
; load the coordinates of object d into bc
ld a, d
call GetObjectStruct
ld hl, OBJECT_NEXT_MAP_X
ld hl, OBJECT_MAP_X
add hl, bc
ld a, [hl]
ld hl, OBJECT_NEXT_MAP_Y
ld hl, OBJECT_MAP_Y
add hl, bc
ld c, [hl]
ld b, a
@@ -732,10 +732,10 @@ GetRelativeFacing::
; load the coordinates of object e into de
ld a, e
call GetObjectStruct
ld hl, OBJECT_NEXT_MAP_X
ld hl, OBJECT_MAP_X
add hl, bc
ld d, [hl]
ld hl, OBJECT_NEXT_MAP_Y
ld hl, OBJECT_MAP_Y
add hl, bc
ld e, [hl]
pop bc
@@ -813,15 +813,15 @@ QueueFollowerFirstStep:
.QueueFirstStep:
ld a, [wObjectFollow_Leader]
call GetObjectStruct
ld hl, OBJECT_NEXT_MAP_X
ld hl, OBJECT_MAP_X
add hl, bc
ld d, [hl]
ld hl, OBJECT_NEXT_MAP_Y
ld hl, OBJECT_MAP_Y
add hl, bc
ld e, [hl]
ld a, [wObjectFollow_Follower]
call GetObjectStruct
ld hl, OBJECT_NEXT_MAP_X
ld hl, OBJECT_MAP_X
add hl, bc
ld a, d
cp [hl]
@@ -837,7 +837,7 @@ QueueFollowerFirstStep:
ret
.check_y
ld hl, OBJECT_NEXT_MAP_Y
ld hl, OBJECT_MAP_Y
add hl, bc
ld a, e
cp [hl]