diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-23 12:40:29 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-23 12:40:29 -0500 |
| commit | c5cc23a35fa2c544e3fa8f5101878ba2127ca83e (patch) | |
| tree | a4e64836ff970e4338a46d66c8b4c3c48e29bc01 /engine | |
| parent | 682548493be7f20b8b7fb26ab0c367c3c24430ed (diff) | |
wGameTimerPause bit flag constants
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/intro_menu.asm | 4 | ||||
| -rwxr-xr-x | engine/main_menu.asm | 2 | ||||
| -rw-r--r-- | engine/scripting.asm | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index a99303cf0..e8a3f221a 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -484,8 +484,8 @@ FinishContinueFunction: ; 5e5d ld [wDontPlayMapMusicOnReload], a ld [wLinkMode], a ld hl, wGameTimerPause - set 0, [hl] - res 7, [hl] + set GAMETIMERPAUSE_TIMER_PAUSED_F, [hl] + res GAMETIMERPAUSE_MOBILE_7_F, [hl] ld hl, wEnteredMapFromContinue set 1, [hl] farcall OverworldLoop diff --git a/engine/main_menu.asm b/engine/main_menu.asm index 3bb3a6293..ff2d187d2 100755 --- a/engine/main_menu.asm +++ b/engine/main_menu.asm @@ -10,7 +10,7 @@ MainMenu: ; 49cdc call GetSGBLayout call SetPalettes ld hl, wGameTimerPause - res 0, [hl] + res GAMETIMERPAUSE_TIMER_PAUSED_F, [hl] call MainMenu_GetWhichMenu ld [wWhichIndexSet], a call MainMenu_PrintCurrentTimeAndDay diff --git a/engine/scripting.asm b/engine/scripting.asm index 1ecdc016c..a3c906a83 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -2804,12 +2804,12 @@ Script_halloffame: ; script command 0xa1 ld hl, wGameTimerPause - res 0, [hl] + res GAMETIMERPAUSE_TIMER_PAUSED_F, [hl] farcall StubbedTrainerRankings_HallOfFame farcall StubbedTrainerRankings_HallOfFame2 farcall HallOfFame ld hl, wGameTimerPause - set 0, [hl] + set GAMETIMERPAUSE_TIMER_PAUSED_F, [hl] jr ReturnFromCredits Script_credits: |