diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-30 22:42:41 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-30 22:42:41 -0500 |
| commit | 1282405d4a672d82f67832dad17da454495b7e97 (patch) | |
| tree | 030ddd9574086cad2d2fb5088266f5c5da2bdecc | |
| parent | ecf10c83a7cb984f81abacfd4d7cefd356a5e6c2 (diff) | |
SPRITEMOVEDATA_LAPRAS → SPRITEMOVEDATA_SWIM_WANDER
(more precise, and encourages hacks to add more SWIM movements)
| -rw-r--r-- | constants/map_object_constants.asm | 2 | ||||
| -rwxr-xr-x | data/sprites/map_objects.asm | 2 | ||||
| -rw-r--r-- | docs/bugs_and_glitches.md | 2 | ||||
| -rw-r--r-- | docs/map_scripts.md | 2 | ||||
| -rw-r--r-- | maps/UnionCaveB2F.asm | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm index 8df3b03f0..18e40437e 100644 --- a/constants/map_object_constants.asm +++ b/constants/map_object_constants.asm @@ -117,7 +117,7 @@ MAPOBJECT_SCREEN_WIDTH EQU 12 const SPRITEMOVEDATA_BIGDOLL ; 21 const SPRITEMOVEDATA_BOULDERDUST ; 22 const SPRITEMOVEDATA_GRASS ; 23 - const SPRITEMOVEDATA_LAPRAS ; 24 + const SPRITEMOVEDATA_SWIM_WANDER ; 24 NUM_SPRITEMOVEDATA EQU const_value SPRITEMOVEDATA_FIELDS EQU 6 diff --git a/data/sprites/map_objects.asm b/data/sprites/map_objects.asm index 0197ad945..dedd4c5ab 100755 --- a/data/sprites/map_objects.asm +++ b/data/sprites/map_objects.asm @@ -42,6 +42,6 @@ SpriteMovementData:: ; 4273 sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, OBJECT_ACTION_BIG_DOLL, $2e, $01, %1100 ; SPRITEMOVEDATA_BIGDOLL sprite_movement_data SPRITEMOVEFN_BOULDERDUST, DOWN, OBJECT_ACTION_BOULDER_DUST, $8e, $01, %0000 ; SPRITEMOVEDATA_BOULDERDUST sprite_movement_data SPRITEMOVEFN_GRASS, DOWN, OBJECT_ACTION_GRASS_SHAKE, $8e, $02, %0000 ; SPRITEMOVEDATA_GRASS - sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY, DOWN, OBJECT_ACTION_STAND, $00, $00, %0010 ; SPRITEMOVEDATA_LAPRAS + sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY, DOWN, OBJECT_ACTION_STAND, $00, $00, %0010 ; SPRITEMOVEDATA_SWIM_WANDER sprite_movement_data SPRITEMOVEFN_00, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 25 ; 4357 diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 3c5728b78..abd5bf3bf 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -1081,7 +1081,7 @@ In [home/map.asm](/home/map.asm): ## `Function6ec1` does not correctly limit object movement -This bug is why the Lapras in Union Cave, which uses `SPRITEMOVEDATA_LAPRAS`, is not restricted by its `1, 1` movement radius. +This bug is why the Lapras in Union Cave, which uses `SPRITEMOVEDATA_SWIM_WANDER`, is not restricted by its `1, 1` movement radius. In [engine/npc_movement.asm](/engine/npc_movement.asm): diff --git a/docs/map_scripts.md b/docs/map_scripts.md index 9ac926c5b..2a5abe13c 100644 --- a/docs/map_scripts.md +++ b/docs/map_scripts.md @@ -166,7 +166,7 @@ Movement types: - `SPRITEMOVEDATA_BIGDOLL` -- `SPRITEMOVEDATA_LAPRAS` +- `SPRITEMOVEDATA_SWIM_WANDER` Object types: diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 1ebce4081..c53636179 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -155,4 +155,4 @@ UnionCaveB2F_MapEvents: object_event 3, 30, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfEmma, -1 object_event 16, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FElixer, EVENT_UNION_CAVE_B2F_ELIXER object_event 12, 19, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, UnionCaveB2FHyperPotion, EVENT_UNION_CAVE_B2F_HYPER_POTION - object_event 11, 31, SPRITE_SURF, SPRITEMOVEDATA_LAPRAS, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, UnionCaveLapras, EVENT_UNION_CAVE_B2F_LAPRAS + object_event 11, 31, SPRITE_SURF, SPRITEMOVEDATA_SWIM_WANDER, 1, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, UnionCaveLapras, EVENT_UNION_CAVE_B2F_LAPRAS |