diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-28 13:35:39 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-28 14:34:38 -0400 |
| commit | ea426a88794b1d216a278b54d18cefafbf7d8771 (patch) | |
| tree | 732c7a81c528251b651b6441d0f4a974548beb2c /constants | |
| parent | 6d333bed5fde0c2da0a6a9df2ccae83933400e42 (diff) | |
Identify more WRAM labels, and start a <X>_DummyFunction label convention
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/engine_flags.asm | 2 | ||||
| -rw-r--r-- | constants/wram_constants.asm | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index 800e7651b..8fa25b4bb 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -115,7 +115,7 @@ ; wSwarmFlags const ENGINE_BUENAS_PASSWORD_2 const ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON -; wGameTimerPause +; wGameTimerPaused const ENGINE_62 ; wPlayerGender const ENGINE_PLAYER_IS_FEMALE diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index c571faf8b..b4156e171 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -21,9 +21,13 @@ AUTO_INPUT EQU $ff const TEMPMON ; 3 const WILDMON ; 4 -; wGameTimerPause:: -GAMETIMERPAUSE_TIMER_PAUSED_F EQU 0 -GAMETIMERPAUSE_MOBILE_7_F EQU 7 +; wGameTimerPaused:: +GAME_TIMER_PAUSED_F EQU 0 +GAME_TIMER_MOBILE_F EQU 7 + +; wJoypadDisable:: +JOYPAD_DISABLE_MON_FAINT_F EQU 6 +JOYPAD_DISABLE_SGB_TRANSFER_F EQU 7 ; wOptions:: TEXT_DELAY_MASK EQU %111 |