summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/facings.asm36
-rwxr-xr-xengine/map_object_action.asm68
-rw-r--r--engine/map_objects.asm10
-rw-r--r--engine/movement.asm2
4 files changed, 58 insertions, 58 deletions
diff --git a/engine/facings.asm b/engine/facings.asm
index 68a1e1f23..ee9efec3f 100644
--- a/engine/facings.asm
+++ b/engine/facings.asm
@@ -20,15 +20,15 @@ Facings: ; 4049
dw FacingFishLeft
dw FacingFishRight
dw FacingEmote
- dw Facing21
- dw Facing22
- dw Facing23
- dw Facing24
- dw Facing25
- dw Facing26
- dw Facing27
- dw Facing28
- dw Facing29
+ dw FacingShadow
+ dw FacingBigDollAsymmetric
+ dw FacingBigDollSymmetric
+ dw FacingWeirdTree0
+ dw FacingWeirdTree1
+ dw FacingWeirdTree2
+ dw FacingWeirdTree3
+ dw FacingBoulderDust1
+ dw FacingBoulderDust2
dw FacingGrass1
dw FacingGrass2
FacingsEnd: dw 0
@@ -49,8 +49,8 @@ BEHIND_BG EQU 1 << OAM_PRIORITY
FacingStepDown0:
FacingStepDown2:
-Facing24:
-Facing26: ; standing down
+FacingWeirdTree0:
+FacingWeirdTree2: ; standing down
db 4 ; #
db 0, 0, 0, $00
db 0, 8, 0, $01
@@ -179,13 +179,13 @@ FacingEmote: ; emote
db 8, 8, 4, $fb
; 419a
-Facing21: ; shadow
+FacingShadow: ; shadow
db 2 ; #
db 0, 0, 4, $fc
db 0, 8, 4 | X_FLIP, $fc
; 41a3
-Facing23: ; big snorlax or lapras doll
+FacingBigDollSymmetric: ; big snorlax or lapras doll
db 16 ; #
db 0, 0, 0, $00
db 0, 8, 0, $01
@@ -205,7 +205,7 @@ Facing23: ; big snorlax or lapras doll
db 24, 16, X_FLIP, $07
; 41e4
-Facing25: ; 41e4
+FacingWeirdTree1: ; 41e4
db 4 ; #
db 0, 0, 0, $04
db 0, 8, 0, $05
@@ -213,7 +213,7 @@ Facing25: ; 41e4
db 8, 8, 0, $07
; 41f5
-Facing27: ; 41f5
+FacingWeirdTree3: ; 41f5
db 4 ; #
db 0, 8, X_FLIP, $04
db 0, 0, X_FLIP, $05
@@ -221,7 +221,7 @@ Facing27: ; 41f5
db 8, 0, X_FLIP, $07
; 4206
-Facing22: ; big doll other than snorlax or lapras
+FacingBigDollAsymmetric: ; big doll other than snorlax or lapras
db 14 ; #
db 0, 0, 0, $00
db 0, 8, 0, $01
@@ -239,7 +239,7 @@ Facing22: ; big doll other than snorlax or lapras
db 24, 16, 0, $0b
; 423f
-Facing28: ; boulder dust 1
+FacingBoulderDust1: ; boulder dust 1
db 4 ; #
db 0, 0, 4, $fe
db 0, 8, 4, $fe
@@ -247,7 +247,7 @@ Facing28: ; boulder dust 1
db 8, 8, 4, $fe
; 4250
-Facing29: ; boulder dust 2
+FacingBoulderDust2: ; boulder dust 2
db 4 ; #
db 0, 0, 4, $ff
db 0, 8, 4, $ff
diff --git a/engine/map_object_action.asm b/engine/map_object_action.asm
index 4795151ae..a7ab87200 100755
--- a/engine/map_object_action.asm
+++ b/engine/map_object_action.asm
@@ -21,16 +21,16 @@ Pointers445f: ; 445f
dw SetFacingCounterclockwiseSpin, SetFacingCurrent ; 04
dw SetFacingCounterclockwiseSpin2, SetFacingStanding ; 05
dw SetFacingFish, SetFacingFish ; 06
- dw Function457b, SetFacingStanding ; 07
- dw Function4582, Function4582 ; 08
- dw Function4589, Function4589 ; 09
- dw Function4590, Function45a4 ; 0a
- dw Function45ab, SetFacingCurrent ; 0c
- dw Function45be, Function45be ; 0b
- dw Function45c5, Function45c5 ; 0d
- dw Function45da, SetFacingStanding ; 0e
+ dw SetFacingShadow, SetFacingStanding ; 07
+ dw SetFacingEmote, SetFacingEmote ; 08
+ dw SetFacingBigDollSym, SetFacingBigDollSym ; 09
+ dw SetFacingBounce, SetFacingFreezeBounce ; 0a
+ dw SetFacingWeirdTree, SetFacingCurrent ; 0b
+ dw SetFacingBigDollAsym, SetFacingBigDollAsym ; 0c
+ dw SetFacingBigDoll, SetFacingBigDoll ; 0d
+ dw SetFacingBoulderDust, SetFacingStanding ; 0e
dw SetFacingGrassShake, SetFacingStanding ; 0f
- dw Function44e4, SetFacingCurrent ; 10
+ dw SetFacingSkyfall, SetFacingCurrent ; 10
; 44a3
SetFacingStanding: ; 44a3
@@ -42,7 +42,7 @@ SetFacingStanding: ; 44a3
SetFacingCurrent: ; 44aa
call GetSpriteDirection
- or 0 ; useless
+ or FACING_STEP_DOWN_0 ; useless
ld hl, OBJECT_FACING_STEP
add hl, bc
ld [hl], a
@@ -77,7 +77,7 @@ SetFacingStepAction: ; 44c1
ld d, a
call GetSpriteDirection
- or 0 ; useless
+ or FACING_STEP_DOWN_0 ; useless
or d
ld hl, OBJECT_FACING_STEP
add hl, bc
@@ -85,7 +85,7 @@ SetFacingStepAction: ; 44c1
ret
; 44e4
-Function44e4: ; 44e4
+SetFacingSkyfall: ; 44e4
ld hl, OBJECT_FLAGS1
add hl, bc
bit SLIDING, [hl]
@@ -104,7 +104,7 @@ Function44e4: ; 44e4
ld d, a
call GetSpriteDirection
- or 0 ; useless
+ or FACING_STEP_DOWN_0 ; useless
or d
ld hl, OBJECT_FACING_STEP
add hl, bc
@@ -130,7 +130,7 @@ SetFacingBumpAction: ; 4508
ld d, a
call GetSpriteDirection
- or 0 ; useless
+ or FACING_STEP_DOWN_0 ; useless
or d
ld hl, OBJECT_FACING_STEP
add hl, bc
@@ -143,7 +143,7 @@ SetFacingCounterclockwiseSpin: ; 4529
ld hl, OBJECT_FACING
add hl, bc
ld a, [hl]
- or 0 ; useless
+ or FACING_STEP_DOWN_0 ; useless
ld hl, OBJECT_FACING_STEP
add hl, bc
ld [hl], a
@@ -210,28 +210,28 @@ SetFacingFish: ; 456e
ret
; 457b
-Function457b: ; 457b
+SetFacingShadow: ; 457b
ld hl, OBJECT_FACING_STEP
add hl, bc
- ld [hl], FACING_15
+ ld [hl], FACING_SHADOW
ret
; 4582
-Function4582: ; 4582 emote
+SetFacingEmote: ; 4582 emote
ld hl, OBJECT_FACING_STEP
add hl, bc
ld [hl], FACING_EMOTE
ret
; 4589
-Function4589: ; 4589
+SetFacingBigDollSym: ; 4589
ld hl, OBJECT_FACING_STEP
add hl, bc
- ld [hl], FACING_17
+ ld [hl], FACING_BIG_DOLL_SYM
ret
; 4590
-Function4590: ; 4590
+SetFacingBounce: ; 4590
ld hl, OBJECT_STEP_FRAME
add hl, bc
ld a, [hl]
@@ -239,21 +239,21 @@ Function4590: ; 4590
and %00001111
ld [hl], a
and %00001000
- jr z, Function45a4
+ jr z, SetFacingFreezeBounce
ld hl, OBJECT_FACING_STEP
add hl, bc
ld [hl], FACING_STEP_UP_0
ret
; 45a4
-Function45a4: ; 45a4
+SetFacingFreezeBounce: ; 45a4
ld hl, OBJECT_FACING_STEP
add hl, bc
- ld [hl], 0
+ ld [hl], FACING_STEP_DOWN_0
ret
; 45ab
-Function45ab: ; 45ab
+SetFacingWeirdTree: ; 45ab
ld hl, OBJECT_STEP_FRAME
add hl, bc
ld a, [hl]
@@ -262,28 +262,28 @@ Function45ab: ; 45ab
and %00001100
rrca
rrca
- add $18
+ add FACING_WEIRD_TREE_0
ld hl, OBJECT_FACING_STEP
add hl, bc
ld [hl], a
ret
; 45be
-Function45be: ; 45be
+SetFacingBigDollAsym: ; 45be
ld hl, OBJECT_FACING_STEP
add hl, bc
- ld [hl], FACING_16
+ ld [hl], FACING_BIG_DOLL_ASYM
ret
; 45c5
-Function45c5: ; 45c5
+SetFacingBigDoll: ; 45c5
ld a, [VariableSprites + SPRITE_BIG_DOLL - SPRITE_VARS]
- ld d, FACING_17 ; symmetric
+ ld d, FACING_BIG_DOLL_SYM ; symmetric
cp SPRITE_BIG_SNORLAX
jr z, .ok
cp SPRITE_BIG_LAPRAS
jr z, .ok
- ld d, FACING_16 ; asymmetric
+ ld d, FACING_BIG_DOLL_ASYM ; asymmetric
.ok
ld hl, OBJECT_FACING_STEP
@@ -292,7 +292,7 @@ Function45c5: ; 45c5
ret
; 45da
-Function45da: ; 45da
+SetFacingBoulderDust: ; 45da
ld hl, OBJECT_STEP_FRAME
add hl, bc
inc [hl]
@@ -301,9 +301,9 @@ Function45da: ; 45da
ld hl, OBJECT_FACING_STEP
add hl, bc
and 2
- ld a, FACING_1C
+ ld a, FACING_BOULDER_DUST_1
jr z, .ok
- inc a ; FACING_1D
+ inc a ; FACING_BOULDER_DUST_2
.ok
ld [hl], a
ret
diff --git a/engine/map_objects.asm b/engine/map_objects.asm
index 949eab968..3f63030ec 100644
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -776,7 +776,7 @@ MapObjectMovementPattern: ; 47dd
ld [hl], STANDING
ld hl, OBJECT_ACTION
add hl, bc
- ld [hl], PERSON_ACTION_09
+ ld [hl], PERSON_ACTION_BIG_SNORLAX
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], STEP_TYPE_04
@@ -789,7 +789,7 @@ MapObjectMovementPattern: ; 47dd
ld [hl], STANDING
ld hl, OBJECT_ACTION
add hl, bc
- ld [hl], PERSON_ACTION_0A
+ ld [hl], PERSON_ACTION_BOUNCE
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld [hl], STEP_TYPE_04
@@ -864,7 +864,7 @@ MapObjectMovementPattern: ; 47dd
call ._MovementShadow_Grass_Emote_BoulderDust
ld hl, OBJECT_ACTION
add hl, bc
- ld [hl], PERSON_ACTION_07
+ ld [hl], PERSON_ACTION_SHADOW
ld hl, OBJECT_STEP_DURATION
add hl, de
ld a, [hl]
@@ -921,7 +921,7 @@ MapObjectMovementPattern: ; 47dd
call ._MovementShadow_Grass_Emote_BoulderDust
ld hl, OBJECT_ACTION
add hl, bc
- ld [hl], PERSON_ACTION_0E
+ ld [hl], PERSON_ACTION_BOULDER_DUST
ld hl, OBJECT_STEP_DURATION
add hl, de
ld a, [hl]
@@ -1804,7 +1804,7 @@ SkyfallTop: ; 4f83
.Init:
ld hl, OBJECT_ACTION
add hl, bc
- ld [hl], PERSON_ACTION_10
+ ld [hl], PERSON_ACTION_SKYFALL
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], 16
diff --git a/engine/movement.asm b/engine/movement.asm
index 3cc2796db..7b58e4023 100644
--- a/engine/movement.asm
+++ b/engine/movement.asm
@@ -365,7 +365,7 @@ Movement_tree_shake: ; 5279
ld hl, OBJECT_ACTION
add hl, bc
- ld [hl], PERSON_ACTION_0B
+ ld [hl], PERSON_ACTION_WEIRD_TREE
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-20 14:12:03 +0000