diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-28 13:35:26 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-28 14:39:52 -0400 |
| commit | b47bfbd813cc7981ff3b99baa7913933f28d67b9 (patch) | |
| tree | 0fea9afdc675ac7381e661f6fd344c55dcb32374 /constants/wram_constants.asm | |
| parent | 9483cf47dd62d3c513dade49747e868f49f0e374 (diff) | |
Identify more WRAM labels, and start a <X>_DummyFunction label convention
Diffstat (limited to 'constants/wram_constants.asm')
| -rw-r--r-- | constants/wram_constants.asm | 8 |
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 |