Prepare to merge

This commit is contained in:
PikalaxALT
2016-01-18 00:39:01 -05:00
parent 7cc2571529
commit 8bf255b9f8
14 changed files with 301 additions and 290 deletions

View File

@@ -193,44 +193,44 @@ NUM_SPRITEHEADER_FIELDS EQU const_value
; sprite movement data table indices
const_def
const SPRITEMOVEDATA_00
const SPRITEMOVEDATA_ITEM_TREE
const SPRITEMOVEDATA_WANDER
const SPRITEMOVEDATA_SPINRANDOM_SLOW
const SPRITEMOVEDATA_WALK_UP_DOWN
const SPRITEMOVEDATA_WALK_LEFT_RIGHT
const SPRITEMOVEDATA_STANDING_DOWN
const SPRITEMOVEDATA_STANDING_UP
const SPRITEMOVEDATA_STANDING_LEFT
const SPRITEMOVEDATA_STANDING_RIGHT
const SPRITEMOVEDATA_SPINRANDOM_FAST
const SPRITEMOVEDATA_PLAYER
const SPRITEMOVEDATA_0C
const SPRITEMOVEDATA_0D
const SPRITEMOVEDATA_0E
const SPRITEMOVEDATA_0F
const SPRITEMOVEDATA_10
const SPRITEMOVEDATA_11
const SPRITEMOVEDATA_12
const SPRITEMOVEDATA_FOLLOWING
const SPRITEMOVEDATA_SCRIPTED
const SPRITEMOVEDATA_SNORLAX
const SPRITEMOVEDATA_POKEMON
const SPRITEMOVEDATA_SUDOWOODO
const SPRITEMOVEDATA_SMASHABLE_ROCK
const SPRITEMOVEDATA_STRENGTH_BOULDER
const SPRITEMOVEDATA_FOLLOWNOTEXACT
const SPRITEMOVEDATA_SHADOW
const SPRITEMOVEDATA_EMOTE
const SPRITEMOVEDATA_SCREENSHAKE
const SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE
const SPRITEMOVEDATA_SPINCLOCKWISE
const SPRITEMOVEDATA_20
const SPRITEMOVEDATA_BIGDOLL
const SPRITEMOVEDATA_BOULDERDUST
const SPRITEMOVEDATA_GRASS
const SPRITEMOVEDATA_LAPRAS
const SPRITEMOVEDATA_25
const SPRITEMOVEDATA_00 ; 00
const SPRITEMOVEDATA_ITEM_TREE ; 01
const SPRITEMOVEDATA_WANDER ; 02
const SPRITEMOVEDATA_SPINRANDOM_SLOW ; 03
const SPRITEMOVEDATA_WALK_UP_DOWN ; 04
const SPRITEMOVEDATA_WALK_LEFT_RIGHT ; 05
const SPRITEMOVEDATA_STANDING_DOWN ; 06
const SPRITEMOVEDATA_STANDING_UP ; 07
const SPRITEMOVEDATA_STANDING_LEFT ; 08
const SPRITEMOVEDATA_STANDING_RIGHT ; 09
const SPRITEMOVEDATA_SPINRANDOM_FAST ; 0a
const SPRITEMOVEDATA_PLAYER ; 0b
const SPRITEMOVEDATA_0C ; 0c
const SPRITEMOVEDATA_0D ; 0d
const SPRITEMOVEDATA_0E ; 0e
const SPRITEMOVEDATA_0F ; 0f
const SPRITEMOVEDATA_10 ; 10
const SPRITEMOVEDATA_11 ; 11
const SPRITEMOVEDATA_12 ; 12
const SPRITEMOVEDATA_FOLLOWING ; 13
const SPRITEMOVEDATA_SCRIPTED ; 14
const SPRITEMOVEDATA_SNORLAX ; 15
const SPRITEMOVEDATA_POKEMON ; 16
const SPRITEMOVEDATA_SUDOWOODO ; 17
const SPRITEMOVEDATA_SMASHABLE_ROCK ; 18
const SPRITEMOVEDATA_STRENGTH_BOULDER ; 19
const SPRITEMOVEDATA_FOLLOWNOTEXACT ; 1a
const SPRITEMOVEDATA_SHADOW ; 1b
const SPRITEMOVEDATA_EMOTE ; 1c
const SPRITEMOVEDATA_SCREENSHAKE ; 1d
const SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE ; 1e
const SPRITEMOVEDATA_SPINCLOCKWISE ; 1f
const SPRITEMOVEDATA_20 ; 20
const SPRITEMOVEDATA_BIGDOLL ; 21
const SPRITEMOVEDATA_BOULDERDUST ; 22
const SPRITEMOVEDATA_GRASS ; 23
const SPRITEMOVEDATA_LAPRAS ; 24
const SPRITEMOVEDATA_25 ; 25
NUM_SPRITEMOVEDATA EQU const_value +- 1
SPRITEMOVEDATA_FIELDS EQU 6