diff options
| author | YamaArashi <shadow962@live.com> | 2016-12-30 17:22:05 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-12-30 17:22:05 -0800 |
| commit | 2811be53bf91ea6e4544e1a2c8df0e763d9972d3 (patch) | |
| tree | c00a2553a47d5b43d71fb0d459f1982d5131558f /engine/map_objects.asm | |
| parent | 51bad5a606d7b2e8f72638a3c688e9792ca60944 (diff) | |
| parent | 65c38930a323463c833e8d84fd1107023f886d64 (diff) | |
Merge branch 'PikalaxALT-master'
Diffstat (limited to 'engine/map_objects.asm')
| -rw-r--r-- | engine/map_objects.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 58c30c8fb..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] @@ -965,7 +965,7 @@ MapObjectMovementPattern: ; 47dd call ._MovementShadow_Grass_Emote_BoulderDust ld hl, OBJECT_ACTION add hl, bc - ld [hl], PERSON_ACTION_0F + ld [hl], PERSON_ACTION_GRASS_SHAKE 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 |