diff options
| author | yenatch <yenatch@gmail.com> | 2018-01-22 01:06:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 01:06:48 -0500 |
| commit | c60f1331fef22b886adf3472d2b4f348832cfaf7 (patch) | |
| tree | 5a471fad61e406f5b3ca1aba67ced0186de01c52 /constants/wram_constants.asm | |
| parent | f27f79488a460f0a89670f3611e1e9e175baf5d6 (diff) | |
| parent | 7fba864883732ccecb1221ae7ff97492d112362a (diff) | |
Merge pull request #456 from Rangi42/master
OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming
Diffstat (limited to 'constants/wram_constants.asm')
| -rw-r--r-- | constants/wram_constants.asm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 8cf06db06..6faa87be4 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -28,6 +28,7 @@ TEXT_DELAY_SLOW EQU 5 const FRAME_6 ; 5 const FRAME_7 ; 6 const FRAME_8 ; 7 +NUM_FRAMES EQU const_value ; TextBoxFlags: const_def @@ -52,6 +53,7 @@ const_value set -1 const UP ; 1 const LEFT ; 2 const RIGHT ; 3 +NUM_DIRECTIONS EQU const_value DOWN_MASK EQU 1 << DOWN UP_MASK EQU 1 << UP @@ -71,12 +73,15 @@ FACE_RIGHT EQU 1 const DAY_F ; 1 const NITE_F ; 2 const DARKNESS_F ; 3 +NUM_DAYTIMES EQU const_value MORN EQU 1 << MORN_F DAY EQU 1 << DAY_F NITE EQU 1 << NITE_F DARKNESS EQU 1 << DARKNESS_F +ANYTIME EQU MORN | DAY | NITE + ; ScriptFlags: ; d434 SCRIPT_RUNNING EQU 2 @@ -116,9 +121,6 @@ PLAYER_SKATE EQU 2 PLAYER_SURF EQU 4 PLAYER_SURF_PIKA EQU 8 -OBJECT_STRUCT_LENGTH EQU 40 -NUM_OBJECT_STRUCTS EQU 13 - ; After-Champion Spawn SPAWN_LANCE EQU 1 SPAWN_RED EQU 2 |