summaryrefslogtreecommitdiff
path: root/constants/wram_constants.asm
diff options
context:
space:
mode:
Diffstat (limited to 'constants/wram_constants.asm')
-rw-r--r--constants/wram_constants.asm17
1 files changed, 11 insertions, 6 deletions
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index 9150cc21..131621d3 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -21,8 +21,12 @@ AUTO_INPUT EQU $ff
const TEMPMON ; 3
const WILDMON ; 4
-; wGameTimerPause::
-GAMETIMERPAUSE_TIMER_PAUSED_F EQU 0
+; wGameTimerPaused::
+GAME_TIMER_PAUSED_F EQU 0
+
+; wJoypadDisable::
+JOYPAD_DISABLE_MON_FAINT_F EQU 6
+JOYPAD_DISABLE_SGB_TRANSFER_F EQU 7
; wOptions::
TEXT_DELAY_MASK EQU %111
@@ -79,11 +83,12 @@ LEFT_MASK EQU 1 << LEFT
RIGHT_MASK EQU 1 << RIGHT
; wFacingDirection::
+ const_def NUM_DIRECTIONS - 1, -1
+ shift_const FACE_DOWN ; 8
+ shift_const FACE_UP ; 4
+ shift_const FACE_LEFT ; 2
+ shift_const FACE_RIGHT ; 1
FACE_CURRENT EQU 0
-FACE_DOWN EQU 8
-FACE_UP EQU 4
-FACE_LEFT EQU 2
-FACE_RIGHT EQU 1
; wPokemonWithdrawDepositParameter::
PC_WITHDRAW EQU 0