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

40
engine/overworld/map_object_action.asm
View File

@@ -22,7 +22,7 @@ ObjectActionPairPointers:
assert_table_length NUM_OBJECT_ACTIONS
SetFacingStanding:
ld hl, OBJECT_FACING_STEP
ld hl, OBJECT_FACING
add hl, bc
ld [hl], STANDING
ret
@@ -30,13 +30,13 @@ SetFacingStanding:
SetFacingCurrent:
call GetSpriteDirection
or FACING_STEP_DOWN_0 ; useless
ld hl, OBJECT_FACING_STEP
ld hl, OBJECT_FACING
add hl, bc
ld [hl], a
ret
SetFacingStandAction:
ld hl, OBJECT_FACING_STEP
ld hl, OBJECT_FACING
add hl, bc
ld a, [hl]
and 1
@@ -64,7 +64,7 @@ SetFacingStepAction:
call GetSpriteDirection
or FACING_STEP_DOWN_0 ; useless
or d
ld hl, OBJECT_FACING_STEP
ld hl, OBJECT_FACING
add hl, bc
ld [hl], a
ret
@@ -90,7 +90,7 @@ SetFacingSkyfall:
call GetSpriteDirection
or FACING_STEP_DOWN_0 ; useless
or d
ld hl, OBJECT_FACING_STEP
ld hl, OBJECT_FACING
add hl, bc
ld [hl], a
ret
@@ -115,18 +115,18 @@ SetFacingBumpAction:
call GetSpriteDirection
or FACING_STEP_DOWN_0 ; useless
or d
ld hl, OBJECT_FACING_STEP
ld hl, OBJECT_FACING
add hl, bc
ld [hl], a
ret
SetFacingCounterclockwiseSpin:
call CounterclockwiseSpinAction
ld hl, OBJECT_FACING
ld hl, OBJECT_DIRECTION
add hl, bc
ld a, [hl]
or FACING_STEP_DOWN_0 ; useless
ld hl, OBJECT_FACING_STEP
ld hl, OBJECT_FACING
add hl, bc
ld [hl], a
ret
@@ -169,7 +169,7 @@ CounterclockwiseSpinAction:
ld hl, .facings
add hl, de
ld a, [hl]
ld hl, OBJECT_FACING
ld hl, OBJECT_DIRECTION
add hl, bc
ld [hl], a
ret
@@ -185,25 +185,25 @@ SetFacingFish:
rrca
rrca
add FACING_FISH_DOWN
ld hl, OBJECT_FACING_STEP
ld hl, OBJECT_FACING
add hl, bc
ld [hl], a
ret
SetFacingShadow:
ld hl, OBJECT_FACING_STEP
ld hl, OBJECT_FACING
add hl, bc
ld [hl], FACING_SHADOW
ret
SetFacingEmote:
ld hl, OBJECT_FACING_STEP
ld hl, OBJECT_FACING
add hl, bc
ld [hl], FACING_EMOTE
ret
SetFacingBigDollSym:
ld hl, OBJECT_FACING_STEP
ld hl, OBJECT_FACING
add hl, bc
ld [hl], FACING_BIG_DOLL_SYM
ret
@@ -217,13 +217,13 @@ SetFacingBounce:
ld [hl], a
and %00001000
jr z, SetFacingFreezeBounce
ld hl, OBJECT_FACING_STEP
ld hl, OBJECT_FACING
add hl, bc
ld [hl], FACING_STEP_UP_0
ret
SetFacingFreezeBounce:
ld hl, OBJECT_FACING_STEP
ld hl, OBJECT_FACING
add hl, bc
ld [hl], FACING_STEP_DOWN_0
ret
@@ -238,13 +238,13 @@ SetFacingWeirdTree:
rrca
rrca
add FACING_WEIRD_TREE_0
ld hl, OBJECT_FACING_STEP
ld hl, OBJECT_FACING
add hl, bc
ld [hl], a
ret
SetFacingBigDollAsym:
ld hl, OBJECT_FACING_STEP
ld hl, OBJECT_FACING
add hl, bc
ld [hl], FACING_BIG_DOLL_ASYM
ret
@@ -259,7 +259,7 @@ SetFacingBigDoll:
ld d, FACING_BIG_DOLL_ASYM ; asymmetric
.ok
ld hl, OBJECT_FACING_STEP
ld hl, OBJECT_FACING
add hl, bc
ld [hl], d
ret
@@ -270,7 +270,7 @@ SetFacingBoulderDust:
inc [hl]
ld a, [hl]
ld hl, OBJECT_FACING_STEP
ld hl, OBJECT_FACING
add hl, bc
and 2
ld a, FACING_BOULDER_DUST_1
@@ -286,7 +286,7 @@ SetFacingGrassShake:
add hl, bc
inc [hl]
ld a, [hl]
ld hl, OBJECT_FACING_STEP
ld hl, OBJECT_FACING
add hl, bc
and 4
ld a, FACING_GRASS_1