diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/script_constants.asm | 56 | ||||
| -rw-r--r-- | constants/sprite_constants.asm | 38 |
2 files changed, 47 insertions, 47 deletions
diff --git a/constants/script_constants.asm b/constants/script_constants.asm index 058f9d92d..f1e608ab9 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -3,34 +3,34 @@ PLAYER EQU 0 LAST_TALKED EQU -2 const_def - const VAR_STRINGBUFFER2 - const VAR_PARTYCOUNT - const VAR_BATTLERESULT - const VAR_BATTLETYPE - const VAR_TIMEOFDAY - const VAR_DEXCAUGHT - const VAR_DEXSEEN - const VAR_BADGES - const VAR_MOVEMENT - const VAR_FACING - const VAR_HOUR - const VAR_WEEKDAY - const VAR_MAPGROUP - const VAR_MAPNUMBER - const VAR_UNOWNCOUNT - const VAR_ROOFPALETTE - const VAR_BOXSPACE - const VAR_CONTESTMINUTES - const VAR_XCOORD - const VAR_YCOORD - const VAR_SPECIALPHONECALL - const VAR_15 - const VAR_KURT_APRICORNS - const VAR_CALLERID - const VAR_BLUECARDBALANCE - const VAR_BUENASPASSWORD - const VAR_KENJI_BREAK -NUM_VARS EQU const_value + const VAR_STRINGBUFFER2 ; 00 + const VAR_PARTYCOUNT ; 01 + const VAR_BATTLERESULT ; 02 + const VAR_BATTLETYPE ; 03 + const VAR_TIMEOFDAY ; 04 + const VAR_DEXCAUGHT ; 05 + const VAR_DEXSEEN ; 06 + const VAR_BADGES ; 07 + const VAR_MOVEMENT ; 08 + const VAR_FACING ; 09 + const VAR_HOUR ; 0a + const VAR_WEEKDAY ; 0b + const VAR_MAPGROUP ; 0c + const VAR_MAPNUMBER ; 0d + const VAR_UNOWNCOUNT ; 0e + const VAR_ROOFPALETTE ; 0f + const VAR_BOXSPACE ; 10 + const VAR_CONTESTMINUTES ; 11 + const VAR_XCOORD ; 12 + const VAR_YCOORD ; 13 + const VAR_SPECIALPHONECALL ; 14 + const VAR_15 ; 15 + const VAR_KURT_APRICORNS ; 16 + const VAR_CALLERID ; 17 + const VAR_BLUECARDBALANCE ; 18 + const VAR_BUENASPASSWORD ; 19 + const VAR_KENJI_BREAK ; 1a +NUM_VARS EQU const_value ; 1b RETVAR_STRBUF2 EQU (0 << 6) RETVAR_ADDR_DE EQU (1 << 6) diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 438e4cb54..c34ac6c28 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -269,24 +269,24 @@ MAX_OUTDOOR_SPRITES EQU 23 const_def const STEP_TYPE_00 - const STEP_TYPE_01 - const STEP_TYPE_02 ; walking - const STEP_TYPE_03 ; stationary + const STEP_TYPE_STANDING + const STEP_TYPE_NPC_WALK + const STEP_TYPE_03 const STEP_TYPE_04 const STEP_TYPE_05 - const STEP_TYPE_06 + const STEP_TYPE_PLAYER_WALK const STEP_TYPE_07 - const STEP_TYPE_08 - const STEP_TYPE_09 - const STEP_TYPE_0A ; half step - const STEP_TYPE_0B ; bump + const STEP_TYPE_NPC_JUMP + const STEP_TYPE_PLAYER_JUMP + const STEP_TYPE_HALF_STEP + const STEP_TYPE_BUMP const STEP_TYPE_TELEPORT_FROM const STEP_TYPE_TELEPORT_TO const STEP_TYPE_SKYFALL const STEP_TYPE_0F - const STEP_TYPE_10 - const STEP_TYPE_11 - const STEP_TYPE_12 + const STEP_TYPE_GOT_BITE + const STEP_TYPE_ROCK_SMASH + const STEP_TYPE_RETURN_DIG const STEP_TYPE_13 const STEP_TYPE_14 const STEP_TYPE_15 @@ -297,14 +297,14 @@ MAX_OUTDOOR_SPRITES EQU 23 const_def const PERSON_ACTION_00 - const PERSON_ACTION_01 - const PERSON_ACTION_02 - const PERSON_ACTION_03 - const PERSON_ACTION_04 - const PERSON_ACTION_05 - const PERSON_ACTION_06 + const PERSON_ACTION_STAND + const PERSON_ACTION_STEP + const PERSON_ACTION_BUMP + const PERSON_ACTION_SPIN + const PERSON_ACTION_SPIN_FLICKER + const PERSON_ACTION_FISHING const PERSON_ACTION_07 - const PERSON_ACTION_08 + const PERSON_ACTION_EMOTE const PERSON_ACTION_09 const PERSON_ACTION_0A const PERSON_ACTION_0B @@ -335,7 +335,7 @@ MAX_OUTDOOR_SPRITES EQU 23 const FACING_11 const FACING_12 const FACING_13 - const FACING_14 + const FACING_EMOTE const FACING_15 const FACING_16 const FACING_17 |