dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move data up to object event graphics to src

Browse Source
This commit is contained in:
GriffinR
2020-03-25 00:57:23 -04:00
parent 970717ee2c
commit 5b612393eb
2 changed files with 308 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_object_movement.s
-249
View File
@@ -757,253 +757,4 @@ gUnknown_839D3A8:: @ 839D3A8
gUnknown_839D3C8:: @ 839D3C8
.incbin "graphics/object_events/pics/unknown/839D3C8.4bpp"
sMovementTypeCallbacks:: @ 839FBC8
.4byte MovementType_None
.4byte MovementType_LookAround
.4byte MovementType_WanderAround
.4byte MovementType_WanderUpAndDown
.4byte MovementType_WanderUpAndDown
.4byte MovementType_WanderLeftAndRight
.4byte MovementType_WanderLeftAndRight
.4byte MovementType_FaceDirection
.4byte MovementType_FaceDirection
.4byte MovementType_FaceDirection
.4byte MovementType_FaceDirection
.4byte sub_805B3B8
.4byte NULL
.4byte MovementType_FaceDownAndUp
.4byte MovementType_FaceLeftAndRight
.4byte MovementType_FaceUpAndLeft
.4byte MovementType_FaceUpAndRight
.4byte MovementType_FaceDownAndLeft
.4byte MovementType_FaceDownAndRight
.4byte MovementType_FaceDownUpAndLeft
.4byte MovementType_FaceDownUpAndRight
.4byte MovementType_FaceUpRightAndLeft
.4byte MovementType_FaceDownRightAndLeft
.4byte MovementType_RotateCounterclockwise
.4byte MovementType_RotateClockwise
.4byte MovementType_WalkBackAndForth
.4byte MovementType_WalkBackAndForth
.4byte MovementType_WalkBackAndForth
.4byte MovementType_WalkBackAndForth
.4byte MovementType_WalkSequenceUpRightLeftDown
.4byte MovementType_WalkSequenceRightLeftDownUp
.4byte MovementType_WalkSequenceDownUpRightLeft
.4byte MovementType_WalkSequenceLeftDownUpRight
.4byte MovementType_WalkSequenceUpLeftRightDown
.4byte MovementType_WalkSequenceLeftRightDownUp
.4byte MovementType_WalkSequenceDownUpLeftRight
.4byte MovementType_WalkSequenceRightDownUpLeft
.4byte MovementType_WalkSequenceLeftUpDownRight
.4byte MovementType_WalkSequenceUpDownRightLeft
.4byte MovementType_WalkSequenceRightLeftUpDown
.4byte MovementType_WalkSequenceDownRightLeftUp
.4byte MovementType_WalkSequenceRightUpDownLeft
.4byte MovementType_WalkSequenceUpDownLeftRight
.4byte MovementType_WalkSequenceLeftRightUpDown
.4byte MovementType_WalkSequenceDownLeftRightUp
.4byte MovementType_WalkSequenceUpLeftDownRight
.4byte MovementType_WalkSequenceDownRightUpLeft
.4byte MovementType_WalkSequenceLeftDownRightUp
.4byte MovementType_WalkSequenceRightUpLeftDown
.4byte MovementType_WalkSequenceUpRightDownLeft
.4byte MovementType_WalkSequenceDownLeftUpRight
.4byte MovementType_WalkSequenceLeftUpRightDown
.4byte MovementType_WalkSequenceRightDownLeftUp
.4byte MovementType_CopyPlayer
.4byte MovementType_CopyPlayer
.4byte MovementType_CopyPlayer
.4byte MovementType_CopyPlayer
.4byte MovementType_TreeDisguise
.4byte MovementType_MountainDisguise
.4byte MovementType_CopyPlayerInGrass
.4byte MovementType_CopyPlayerInGrass
.4byte MovementType_CopyPlayerInGrass
.4byte MovementType_CopyPlayerInGrass
.4byte MovementType_Hidden
.4byte MovementType_WalkInPlace
.4byte MovementType_WalkInPlace
.4byte MovementType_WalkInPlace
.4byte MovementType_WalkInPlace
.4byte MovementType_WalkSlowlyInPlace
.4byte MovementType_WalkSlowlyInPlace
.4byte MovementType_WalkSlowlyInPlace
.4byte MovementType_WalkSlowlyInPlace
.4byte MovementType_JogInPlace
.4byte MovementType_JogInPlace
.4byte MovementType_JogInPlace
.4byte MovementType_JogInPlace
.4byte MovementType_Invisible
.4byte sub_8063298
.4byte sub_80632BC
.4byte sub_80632E0
.4byte MovementType_WanderAroundDuplicate
gRangedMovementTypes:: @ 839FD0C
.byte FALSE @ MOVEMENT_TYPE_NONE
.byte FALSE @ MOVEMENT_TYPE_LOOK_AROUND
.byte TRUE @ MOVEMENT_TYPE_WANDER_AROUND
.byte TRUE @ MOVEMENT_TYPE_WANDER_UP_AND_DOWN
.byte TRUE @ MOVEMENT_TYPE_WANDER_DOWN_AND_UP
.byte TRUE @ MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT
.byte TRUE @ MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT
.byte FALSE @ MOVEMENT_TYPE_FACE_UP
.byte FALSE @ MOVEMENT_TYPE_FACE_DOWN
.byte FALSE @ MOVEMENT_TYPE_FACE_LEFT
.byte FALSE @ MOVEMENT_TYPE_FACE_RIGHT
.byte FALSE @ MOVEMENT_TYPE_PLAYER
.byte FALSE @ MOVEMENT_TYPE_BERRY_TREE_GROWTH
.byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_AND_UP
.byte FALSE @ MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT
.byte FALSE @ MOVEMENT_TYPE_FACE_UP_AND_LEFT
.byte FALSE @ MOVEMENT_TYPE_FACE_UP_AND_RIGHT
.byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_AND_LEFT
.byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT
.byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT
.byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT
.byte FALSE @ MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT
.byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT
.byte FALSE @ MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE
.byte FALSE @ MOVEMENT_TYPE_ROTATE_CLOCKWISE
.byte TRUE @ MOVEMENT_TYPE_WALK_UP_AND_DOWN
.byte TRUE @ MOVEMENT_TYPE_WALK_DOWN_AND_UP
.byte TRUE @ MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT
.byte TRUE @ MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN
.byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP
.byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER
.byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE
.byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE
.byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE
.byte FALSE @ MOVEMENT_TYPE_TREE_DISGUISE
.byte FALSE @ MOVEMENT_TYPE_MOUNTAIN_DISGUISE
.byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS
.byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS
.byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS
.byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS
.byte FALSE @ MOVEMENT_TYPE_HIDDEN
.byte FALSE @ MOVEMENT_TYPE_WALK_IN_PLACE_DOWN
.byte FALSE @ MOVEMENT_TYPE_WALK_IN_PLACE_UP
.byte FALSE @ MOVEMENT_TYPE_WALK_IN_PLACE_LEFT
.byte FALSE @ MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT
.byte FALSE @ MOVEMENT_TYPE_JOG_IN_PLACE_DOWN
.byte FALSE @ MOVEMENT_TYPE_JOG_IN_PLACE_UP
.byte FALSE @ MOVEMENT_TYPE_JOG_IN_PLACE_LEFT
.byte FALSE @ MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT
.byte FALSE @ MOVEMENT_TYPE_RUN_IN_PLACE_DOWN
.byte FALSE @ MOVEMENT_TYPE_RUN_IN_PLACE_UP
.byte FALSE @ MOVEMENT_TYPE_RUN_IN_PLACE_LEFT
.byte FALSE @ MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT
.byte FALSE @ MOVEMENT_TYPE_INVISIBLE
.byte FALSE @ MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN
.byte FALSE @ MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP
.byte FALSE @ MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT
.byte TRUE @ MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT
gInitialMovementTypeFacingDirections:: @ 839FD5D
.byte 1 @ [MOVEMENT_TYPE_NONE] = DIR_SOUTH,
.byte 1 @ [MOVEMENT_TYPE_LOOK_AROUND] = DIR_SOUTH,
.byte 1 @ [MOVEMENT_TYPE_WANDER_AROUND] = DIR_SOUTH,
.byte 2 @ [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = DIR_NORTH,
.byte 1 @ [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = DIR_SOUTH,
.byte 3 @ [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = DIR_WEST,
.byte 4 @ [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = DIR_EAST,
.byte 2 @ [MOVEMENT_TYPE_FACE_UP] = DIR_NORTH,
.byte 1 @ [MOVEMENT_TYPE_FACE_DOWN] = DIR_SOUTH,
.byte 3 @ [MOVEMENT_TYPE_FACE_LEFT] = DIR_WEST,
.byte 4 @ [MOVEMENT_TYPE_FACE_RIGHT] = DIR_EAST,
.byte 1 @ [MOVEMENT_TYPE_PLAYER] = DIR_SOUTH,
.byte 1 @ [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = DIR_SOUTH,
.byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = DIR_SOUTH,
.byte 3 @ [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = DIR_WEST,
.byte 2 @ [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = DIR_NORTH,
.byte 2 @ [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = DIR_NORTH,
.byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = DIR_SOUTH,
.byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = DIR_SOUTH,
.byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = DIR_SOUTH,
.byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = DIR_SOUTH,
.byte 2 @ [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = DIR_NORTH,
.byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = DIR_SOUTH,
.byte 1 @ [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = DIR_SOUTH,
.byte 1 @ [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = DIR_SOUTH,
.byte 2 @ [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = DIR_NORTH,
.byte 1 @ [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = DIR_SOUTH,
.byte 3 @ [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = DIR_WEST,
.byte 4 @ [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = DIR_EAST,
.byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = DIR_NORTH,
.byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = DIR_EAST,
.byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = DIR_SOUTH,
.byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = DIR_WEST,
.byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = DIR_NORTH,
.byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = DIR_WEST,
.byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = DIR_SOUTH,
.byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = DIR_EAST,
.byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = DIR_WEST,
.byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = DIR_NORTH,
.byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = DIR_EAST,
.byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = DIR_SOUTH,
.byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = DIR_EAST,
.byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = DIR_NORTH,
.byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = DIR_WEST,
.byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = DIR_SOUTH,
.byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = DIR_NORTH,
.byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = DIR_SOUTH,
.byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = DIR_WEST,
.byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = DIR_EAST,
.byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = DIR_NORTH,
.byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = DIR_SOUTH,
.byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = DIR_WEST,
.byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = DIR_EAST,
.byte 2 @ [MOVEMENT_TYPE_COPY_PLAYER] = DIR_NORTH,
.byte 1 @ [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = DIR_SOUTH,
.byte 3 @ [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = DIR_WEST,
.byte 4 @ [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = DIR_EAST,
.byte 1 @ [MOVEMENT_TYPE_TREE_DISGUISE] = DIR_SOUTH,
.byte 1 @ [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = DIR_SOUTH,
.byte 2 @ [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = DIR_NORTH,
.byte 1 @ [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = DIR_SOUTH,
.byte 3 @ [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = DIR_WEST,
.byte 4 @ [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = DIR_EAST,
.byte 1 @ [MOVEMENT_TYPE_HIDDEN] = DIR_SOUTH,
.byte 1 @ [MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = DIR_SOUTH,
.byte 2 @ [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = DIR_NORTH,
.byte 3 @ [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = DIR_WEST,
.byte 4 @ [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = DIR_EAST,
.byte 1 @ [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = DIR_SOUTH,
.byte 2 @ [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = DIR_NORTH,
.byte 3 @ [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = DIR_WEST,
.byte 4 @ [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = DIR_EAST,
.byte 1 @ [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = DIR_SOUTH,
.byte 2 @ [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = DIR_NORTH,
.byte 3 @ [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = DIR_WEST,
.byte 4 @ [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = DIR_EAST,
.byte 1 @ [MOVEMENT_TYPE_INVISIBLE] = DIR_SOUTH,
.byte 1 @ [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN] = DIR_SOUTH,
.byte 1 @ [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP] = DIR_SOUTH,
.byte 1 @ [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT] = DIR_SOUTH,
.byte 1 @ [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = DIR_SOUTH,
@9186