pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

wGameTimerPause bit flag constants

Browse Source
This commit is contained in:
Rangi 2018-01-23 12:40:29 -05:00
parent 682548493b
commit c5cc23a35f
9 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
constants/wram_constants.asm
View File

@ -16,6 +16,10 @@ AUTO_INPUT EQU $ff
const TEMPMON ; 3
const WILDMON ; 4
; wGameTimerPause:: ; cfbc
GAMETIMERPAUSE_TIMER_PAUSED_F EQU 0
GAMETIMERPAUSE_MOBILE_7_F EQU 7
; Options:: ; cfcc
const_value set 4
const NO_TEXT_SCROLL ; 4

4
data/engine_flags.asm
View File

@ -122,10 +122,10 @@ EngineFlags: ; 80462
engine_flag wWeeklyFlags, WEEKLYFLAGS_DAILY_MOVE_TUTOR_F
engine_flag wWeeklyFlags, WEEKLYFLAGS_BUENAS_PASSWORD_F
engine_flag wSwarmFlags, SWARMFLAGS_BUENAS_PASSWORD_F
engine_flag wSwarmFlags, SWARMFLAGS_BUENAS_PASSWORD_F ; $60
engine_flag wSwarmFlags, SWARMFLAGS_GOLDENROD_DEPT_STORE_SALE_F
engine_flag wGameTimerPause, 7 ; $62
engine_flag wGameTimerPause, GAMETIMERPAUSE_MOBILE_7_F
engine_flag wPlayerGender, PLAYERGENDER_FEMALE_F

4
engine/intro_menu.asm
View File

@ -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

2
engine/main_menu.asm
View File

@ -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

4
engine/scripting.asm
View File

@ -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:

2
home/game_time.asm
View File

@ -39,7 +39,7 @@ UpdateGameTimer:: ; 20ad
; Is the timer paused?
ld hl, wGameTimerPause
bit 0, [hl]
bit GAMETIMERPAUSE_TIMER_PAUSED_F, [hl]
ret z
; Is the timer already capped?

6
mobile/mobile_22.asm
View File

@ -26,17 +26,17 @@ OpenSRAMBank4: ; 89160
Function89168: ; 89168 (22:5168)
ld hl, wGameTimerPause
set 7, [hl]
set GAMETIMERPAUSE_MOBILE_7_F, [hl]
ret
Function8916e: ; 8916e (22:516e)
ld hl, wGameTimerPause
res 7, [hl]
res GAMETIMERPAUSE_MOBILE_7_F, [hl]
ret
Function89174: ; 89174 (22:5174)
ld hl, wGameTimerPause
bit 7, [hl]
bit GAMETIMERPAUSE_MOBILE_7_F, [hl]
ret
Function8917a: ; 8917a (22:517a)

6
mobile/mobile_40.asm
View File

@ -2812,7 +2812,7 @@ Special_Function1011f1: ; 1011f1
ld hl, wdc41
res 4, [hl]
ld hl, wGameTimerPause
bit 7, [hl]
bit GAMETIMERPAUSE_MOBILE_7_F, [hl]
jr z, .skip
ld hl, wdc41
set 4, [hl]
@ -4703,7 +4703,7 @@ Function101e98: ; 101e98
farcall Function8adb3
ret c
ld hl, wGameTimerPause
set 7, [hl]
set GAMETIMERPAUSE_MOBILE_7_F, [hl]
ld hl, wdc41
set 4, [hl]
ret
@ -4711,7 +4711,7 @@ Function101e98: ; 101e98
Function101ead: ; 101ead
ld hl, wGameTimerPause
bit 7, [hl]
bit GAMETIMERPAUSE_MOBILE_7_F, [hl]
jr nz, .asm_101ec8
ld hl, wdc41
bit 2, [hl]

3
wram.asm
View File

@ -1491,7 +1491,8 @@ wFarCallBCBuffer:: dw ; cfb9
wcfbb:: db
wGameTimerPause:: ; cfbc
; bit 0
; bit 0: game timer paused
; bit 7: something mobile
db
ds 1