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

26
home/map_objects.asm
View File

@@ -71,14 +71,14 @@ DoesSpriteHaveFacings::
pop de
ret
GetPlayerStandingTile::
ld a, [wPlayerStandingTile]
GetPlayerTile::
ld a, [wPlayerTile]
call GetTileCollision
ld b, a
ret
CheckOnWater::
ld a, [wPlayerStandingTile]
ld a, [wPlayerTile]
call GetTileCollision
sub WATER_TILE
ret z
@@ -189,7 +189,7 @@ CheckWaterfallTile::
ret
CheckStandingOnEntrance::
ld a, [wPlayerStandingTile]
ld a, [wPlayerTile]
cp COLL_DOOR
ret z
cp COLL_DOOR_79
@@ -404,7 +404,7 @@ LoadMovementDataPointer::
call CheckObjectVisibility
ret c
ld hl, OBJECT_MOVEMENTTYPE
ld hl, OBJECT_MOVEMENT_TYPE
add hl, bc
ld [hl], SPRITEMOVEDATA_SCRIPTED
@@ -447,7 +447,7 @@ FindFirstEmptyObjectStruct::
ret
GetSpriteMovementFunction::
ld hl, OBJECT_MOVEMENTTYPE
ld hl, OBJECT_MOVEMENT_TYPE
add hl, bc
ld a, [hl]
cp NUM_SPRITEMOVEDATA
@@ -500,7 +500,7 @@ CopySpriteMovementData::
ret
.CopyData:
ld hl, OBJECT_MOVEMENTTYPE
ld hl, OBJECT_MOVEMENT_TYPE
add hl, de
ld [hl], a
@@ -520,7 +520,7 @@ endr
rlca
rlca
maskbits NUM_DIRECTIONS, 2
ld hl, OBJECT_FACING
ld hl, OBJECT_DIRECTION
add hl, de
ld [hl], a
@@ -549,16 +549,16 @@ endr
ld [hl], a
ret
_GetMovementByte::
_GetMovementIndex::
; Switch to the movement data bank
ldh a, [hROMBank]
push af
ld a, [hli]
rst Bankswitch
; Load the current script byte as given by OBJECT_MOVEMENT_BYTE_INDEX, and increment OBJECT_MOVEMENT_BYTE_INDEX
; Load the current script byte as given by OBJECT_MOVEMENT_INDEX, and increment OBJECT_MOVEMENT_INDEX
ld a, [hli]
ld d, [hl]
ld hl, OBJECT_MOVEMENT_BYTE_INDEX
ld hl, OBJECT_MOVEMENT_INDEX
add hl, bc
add [hl]
ld e, a
@@ -611,7 +611,7 @@ DoesObjectHaveASprite::
SetSpriteDirection::
; preserves other flags
push af
ld hl, OBJECT_FACING
ld hl, OBJECT_DIRECTION
add hl, bc
ld a, [hl]
and %11110011
@@ -623,7 +623,7 @@ SetSpriteDirection::
ret
GetSpriteDirection::
ld hl, OBJECT_FACING
ld hl, OBJECT_DIRECTION
add hl, bc
ld a, [hl]
maskbits NUM_DIRECTIONS, 2