diff options
| author | Aroymart <andrewrmartinek@gmail.com> | 2020-12-06 21:06:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-06 21:06:54 -0500 |
| commit | d7f996687fa01473b08cb572d7b1f59275eaa851 (patch) | |
| tree | c46cfba092c5797e9787fe190e8f21cfcb7fd120 /src/constants | |
| parent | 6c44ebb86d6d45150e69fbab82d4e1a251c7366b (diff) | |
| parent | db90dae74cc91f53e9ec815531572bdd295efacc (diff) | |
Merge branch 'master' into rgbds
Diffstat (limited to 'src/constants')
| -rw-r--r-- | src/constants/duel_constants.asm | 11 | ||||
| -rw-r--r-- | src/constants/sprite_constants.asm | 39 |
2 files changed, 35 insertions, 15 deletions
diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index de1d07a..928e78c 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -118,8 +118,15 @@ PARALYZED EQU $03 POISONED EQU $80 DOUBLE_POISONED EQU $c0 -CNF_SLP_PRZ EQU $0f ; confused, asleep or paralyzed -PSN_DBLPSN EQU $f0 ; poisoned or double poisoned + +DOUBLE_POISONED_F EQU 6 +POISONED_F EQU 7 + + +CNF_SLP_PRZ EQU $0f ; confused, asleep or paralyzed +PSN_DBLPSN EQU $f0 ; poisoned or double poisoned +PSN_DAMAGE EQU 10 +DBLPSN_DAMAGE EQU 20 ; substatus conditions (DUELVARS_ARENA_CARD_SUBSTATUS*) diff --git a/src/constants/sprite_constants.asm b/src/constants/sprite_constants.asm index dc051d9..8447934 100644 --- a/src/constants/sprite_constants.asm +++ b/src/constants/sprite_constants.asm @@ -3,20 +3,33 @@ SPRITE_ANIM_BUFFER_CAPACITY EQU 16 ; sprites ; sprite_anim_struct constants const_def - const SPRITE_ANIM_FIELD_00 - const SPRITE_ANIM_FIELD_01 + const SPRITE_ANIM_ENABLED + const SPRITE_ANIM_ATTRIBUTES const SPRITE_ANIM_COORD_X const SPRITE_ANIM_COORD_Y const SPRITE_ANIM_TILE_ID - const SPRITE_ANIM_FIELD_05 - const SPRITE_ANIM_FIELD_06 - const SPRITE_ANIM_FIELD_07 - const SPRITE_ANIM_FIELD_08 - const SPRITE_ANIM_FIELD_09 - const SPRITE_ANIM_FIELD_0A - const SPRITE_ANIM_FIELD_0B - const SPRITE_ANIM_FIELD_0C - const SPRITE_ANIM_FIELD_0D - const SPRITE_ANIM_MOVEMENT_COUNTER - const SPRITE_ANIM_FIELD_0F + const SPRITE_ANIM_ID + const SPRITE_ANIM_BANK + const SPRITE_ANIM_POINTER +const_value = const_value+1 ; pointer + const SPRITE_ANIM_FRAME_OFFSET_POINTER +const_value = const_value+1 ; pointer + const SPRITE_ANIM_FRAME_BANK + const SPRITE_ANIM_FRAME_DATA_POINTER +const_value = const_value+1 ; pointer + const SPRITE_ANIM_COUNTER + const SPRITE_ANIM_FLAGS SPRITE_ANIM_LENGTH EQU const_value + +; SPRITE_ANIM_FLAGS values + const_def + const SPRITE_ANIM_FLAG_X_SUBTRACT + const SPRITE_ANIM_FLAG_Y_SUBTRACT + const SPRITE_ANIM_FLAG_SPEED + const SPRITE_ANIM_FLAG_3 + const SPRITE_ANIM_FLAG_4 + const SPRITE_ANIM_FLAG_5 + const SPRITE_ANIM_FLAG_6 + const SPRITE_ANIM_FLAG_SKIP_DRAW + +SPRITE_FRAME_OFFSET_SIZE EQU 4 |