diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/map_object_constants.asm | 2 | ||||
| -rw-r--r-- | constants/wram_constants.asm | 21 |
2 files changed, 17 insertions, 6 deletions
diff --git a/constants/map_object_constants.asm b/constants/map_object_constants.asm index 2c28dd7e..6a6cec59 100644 --- a/constants/map_object_constants.asm +++ b/constants/map_object_constants.asm @@ -34,7 +34,7 @@ const OBJECT_1F ; 1f const OBJECT_RANGE ; 20 ; 21-27 are not used -OBJECT_STRUCT_LENGTH EQU 40 +OBJECT_LENGTH EQU 40 NUM_OBJECT_STRUCTS EQU 13 ; see wObjectStructs ; object_struct OBJECT_FACING values diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 6b739c6c..7cdebc05 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -14,6 +14,10 @@ AUTO_INPUT EQU $ff const TEMPMON ; 3 const WILDMON ; 4 +; wGameTimerPause:: ; cfbc +GAMETIMERPAUSE_TIMER_PAUSED_F EQU 0 +GAMETIMERPAUSE_MOBILE_7_F EQU 7 + ; wOptions:: ; cfcc TEXT_DELAY_MASK EQU %111 const_def 4 @@ -43,11 +47,18 @@ PRINT_DARKER EQU $60 PRINT_DARKEST EQU $7f ; WalkingDirection: ; d043 -STANDING EQU -1 -DOWN EQU 0 -UP EQU 1 -LEFT EQU 2 -RIGHT EQU 3 + const_def -1 + const STANDING ; -1 + const DOWN ; 0 + const UP ; 1 + const LEFT ; 2 + const RIGHT ; 3 +NUM_DIRECTIONS EQU const_value + +DOWN_MASK EQU 1 << DOWN +UP_MASK EQU 1 << UP +LEFT_MASK EQU 1 << LEFT +RIGHT_MASK EQU 1 << RIGHT ; FacingDirection: ; d044 FACE_CURRENT EQU 0 |