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

66
engine/overworld/npc_movement.asm
View File

@@ -60,17 +60,17 @@ CanObjectMoveInDirection:
WillObjectBumpIntoWater:
call CanObjectLeaveTile
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]
ld hl, OBJECT_PALETTE
add hl, bc
bit OAM_PRIORITY, [hl]
jp nz, WillObjectRemainOnWater
ld hl, OBJECT_NEXT_TILE
ld hl, OBJECT_TILE
add hl, bc
ld a, [hl]
ld d, a
@@ -83,7 +83,7 @@ WillObjectBumpIntoWater:
WillObjectBumpIntoLand:
call CanObjectLeaveTile
ret c
ld hl, OBJECT_NEXT_TILE
ld hl, OBJECT_TILE
add hl, bc
ld a, [hl]
call GetTileCollision
@@ -93,13 +93,13 @@ WillObjectBumpIntoLand:
ret
WillObjectBumpIntoTile:
ld hl, OBJECT_NEXT_TILE
ld hl, OBJECT_TILE
add hl, bc
ld a, [hl]
call GetSideWallDirectionMask
ret nc
push af
ld hl, OBJECT_DIRECTION_WALKING
ld hl, OBJECT_WALKING
add hl, bc
ld a, [hl]
maskbits NUM_DIRECTIONS
@@ -120,13 +120,13 @@ WillObjectBumpIntoTile:
db LEFT_MASK ; RIGHT
CanObjectLeaveTile:
ld hl, OBJECT_STANDING_TILE
ld hl, OBJECT_LAST_TILE
add hl, bc
ld a, [hl]
call GetSideWallDirectionMask
ret nc
push af
ld hl, OBJECT_DIRECTION_WALKING
ld hl, OBJECT_WALKING
add hl, bc
maskbits NUM_DIRECTIONS
ld e, a
@@ -177,7 +177,7 @@ GetSideWallDirectionMask:
db DOWN_MASK | LEFT_MASK ; COLL_UP_LEFT_WALL/BUOY
WillObjectRemainOnWater:
ld hl, OBJECT_DIRECTION_WALKING
ld hl, OBJECT_WALKING
add hl, bc
ld a, [hl]
maskbits NUM_DIRECTIONS
@@ -233,14 +233,14 @@ CheckFacingObject::
call CheckCounterTile
jr nz, .not_counter
ld a, [wPlayerStandingMapX]
ld a, [wPlayerMapX]
sub d
cpl
inc a
add d
ld d, a
ld a, [wPlayerStandingMapY]
ld a, [wPlayerMapY]
sub e
cpl
inc a
@@ -253,7 +253,7 @@ CheckFacingObject::
ldh [hMapObjectIndex], a
call IsNPCAtCoord
ret nc
ld hl, OBJECT_DIRECTION_WALKING
ld hl, OBJECT_WALKING
add hl, bc
ld a, [hl]
cp STANDING
@@ -266,10 +266,10 @@ CheckFacingObject::
ret
WillObjectBumpIntoSomeoneElse:
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]
jr IsNPCAtCoord
@@ -282,10 +282,10 @@ IsObjectFacingSomeoneElse: ; unreferenced
ret
.GetFacingCoords:
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]
call GetSpriteDirection
@@ -333,12 +333,12 @@ IsNPCAtCoord:
jr .continue
.not_big
ld hl, OBJECT_NEXT_MAP_X
ld hl, OBJECT_MAP_X
add hl, bc
ld a, [hl]
cp d
jr nz, .check_current_coords
ld hl, OBJECT_NEXT_MAP_Y
ld hl, OBJECT_MAP_Y
add hl, bc
ld a, [hl]
cp e
@@ -352,12 +352,12 @@ IsNPCAtCoord:
jr nz, .yes
.check_current_coords
ld hl, OBJECT_MAP_X
ld hl, OBJECT_LAST_MAP_X
add hl, bc
ld a, [hl]
cp d
jr nz, .next
ld hl, OBJECT_MAP_Y
ld hl, OBJECT_LAST_MAP_Y
add hl, bc
ld a, [hl]
cp e
@@ -402,7 +402,7 @@ HasObjectReachedMovementLimit:
ld a, [hl]
add e
ld e, a
ld hl, OBJECT_NEXT_MAP_X
ld hl, OBJECT_MAP_X
add hl, bc
ld a, [hl]
cp d
@@ -427,7 +427,7 @@ HasObjectReachedMovementLimit:
ld a, [hl]
add e
ld e, a
ld hl, OBJECT_NEXT_MAP_Y
ld hl, OBJECT_MAP_Y
add hl, bc
ld a, [hl]
cp d
@@ -444,7 +444,7 @@ HasObjectReachedMovementLimit:
ret
IsObjectMovingOffEdgeOfScreen:
ld hl, OBJECT_NEXT_MAP_X
ld hl, OBJECT_MAP_X
add hl, bc
ld a, [wXCoord]
cp [hl]
@@ -455,7 +455,7 @@ IsObjectMovingOffEdgeOfScreen:
jr c, .yes
.check_y
ld hl, OBJECT_NEXT_MAP_Y
ld hl, OBJECT_MAP_Y
add hl, bc
ld a, [wYCoord]
cp [hl]
@@ -474,9 +474,9 @@ IsObjectMovingOffEdgeOfScreen:
ret
IsNPCAtPlayerCoord: ; unreferenced
ld a, [wPlayerStandingMapX]
ld a, [wPlayerMapX]
ld d, a
ld a, [wPlayerStandingMapY]
ld a, [wPlayerMapY]
ld e, a
ld bc, wObjectStructs
xor a
@@ -485,7 +485,7 @@ IsNPCAtPlayerCoord: ; unreferenced
call DoesObjectHaveASprite
jr z, .next
ld hl, OBJECT_MOVEMENTTYPE
ld hl, OBJECT_MOVEMENT_TYPE
add hl, bc
ld a, [hl]
cp SPRITEMOVEDATA_BIGDOLLSYM
@@ -495,12 +495,12 @@ IsNPCAtPlayerCoord: ; unreferenced
jr .next
.not_big
ld hl, OBJECT_NEXT_MAP_Y
ld hl, OBJECT_MAP_Y
add hl, bc
ld a, [hl]
cp e
jr nz, .check_current_coords
ld hl, OBJECT_NEXT_MAP_X
ld hl, OBJECT_MAP_X
add hl, bc
ld a, [hl]
cp d
@@ -511,12 +511,12 @@ IsNPCAtPlayerCoord: ; unreferenced
jr .yes
.check_current_coords
ld hl, OBJECT_MAP_Y
ld hl, OBJECT_LAST_MAP_Y
add hl, bc
ld a, [hl]
cp e
jr nz, .next
ld hl, OBJECT_MAP_X
ld hl, OBJECT_LAST_MAP_X
add hl, bc
ld a, [hl]
cp d
@@ -540,14 +540,14 @@ IsNPCAtPlayerCoord: ; unreferenced
ret
WillObjectIntersectBigObject:
ld hl, OBJECT_NEXT_MAP_X
ld hl, OBJECT_MAP_X
add hl, bc
ld a, d
sub [hl]
jr c, .nope
cp 2 ; big doll width
jr nc, .nope
ld hl, OBJECT_NEXT_MAP_Y
ld hl, OBJECT_MAP_Y
add hl, bc
ld a, e
sub [hl]