summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
Diffstat (limited to 'constants')
-rw-r--r--constants/wram_constants.asm8
1 files changed, 6 insertions, 2 deletions
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index 9150cc21..9f93aa33 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