Fix game time labels

50 files changed, 80 insertions, 78 deletions

diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm
index 73c4918b..4225c5a1 100755
--- a/engine/hall_of_fame.asm
+++ b/engine/hall_of_fame.asm
@@ -224,12 +224,12 @@ HoFDisplayPlayerStats: ; 70377 (1c:4377)
 	ld de, HoFPlayTimeText
 	call PlaceString
 	coord hl, 5, 7
-	ld de, wPlayTimeHours + 1
+	ld de, wPlayTimeHours
 	lb bc, 1, 3
 	call PrintNumber
 	ld [hl], $6d
 	inc hl
-	ld de, wPlayTimeMinutes + 1
+	ld de, wPlayTimeMinutes
 	lb bc, LEADING_ZEROES | 1, 2
 	call PrintNumber
 	coord hl, 1, 9
diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm
index 65a4669e..770b6b79 100755
--- a/engine/hidden_object_functions17.asm
+++ b/engine/hidden_object_functions17.asm
@@ -402,7 +402,7 @@ GymTrashScript: ; 5ddfc (17:5dfc)
 .openSecondLock
 ; Completed the trash can puzzle.
 	SetEvent EVENT_2ND_LOCK_OPENED
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	set 6, [hl]
 
 	tx_pre_id VermilionGymTrashSuccesText3
diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm
index f123e89b..87305472 100755
--- a/engine/hidden_object_functions7.asm
+++ b/engine/hidden_object_functions7.asm
@@ -199,7 +199,7 @@ CinnabarGymQuiz_1ea92: ; 1ea92 (7:6a92)
 	ld a, [wCurrentMenuItem]
 	cp c
 	jr nz, .wrongAnswer
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
 	ld a, [hGymGateIndex]
 	ld [$ffe0], a
diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index 7319ec17..75458c5e 100755
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -90,7 +90,7 @@ MainMenu: ; 5af2 (1:5af2)
 	jp .mainMenuLoop
 .choseContinue
 	call DisplayContinueGameInfo
-	ld hl,wd126
+	ld hl,wCurrentMapScriptFlags
 	set 5,[hl]
 .inputLoop
 	xor a
@@ -411,12 +411,12 @@ PrintNumOwnedMons: ; 5e42 (1:5e42)
 	jp PrintNumber
 
 PrintPlayTime: ; 5e55 (1:5e55)
-	ld de, wPlayTimeHours + 1
+	ld de, wPlayTimeHours
 	lb bc, 1, 3
 	call PrintNumber
 	ld [hl], $6d
 	inc hl
-	ld de, wPlayTimeMinutes + 1
+	ld de, wPlayTimeMinutes
 	lb bc, LEADING_ZEROES | 1, 2
 	jp PrintNumber
 
diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm
index f7bb5a46..34c21da0 100755
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -601,12 +601,12 @@ DrawTrainerInfo: ; 1349a (4:749a)
 	ld c,$e3
 	call PrintBCDNumber
 	coord hl, 9, 6
-	ld de,wPlayTimeHours + 1 ; hours
+	ld de,wPlayTimeHours ; hours
 	lb bc, LEFT_ALIGN | 1, 3
 	call PrintNumber
 	ld [hl],$d6 ; colon tile ID
 	inc hl
-	ld de,wPlayTimeMinutes + 1 ; minutes
+	ld de,wPlayTimeMinutes ; minutes
 	lb bc, LEADING_ZEROES | 1, 2
 	jp PrintNumber
 
diff --git a/engine/overworld/card_key.asm b/engine/overworld/card_key.asm
index 2ef7529c..49d99575 100755
--- a/engine/overworld/card_key.asm
+++ b/engine/overworld/card_key.asm
@@ -49,7 +49,7 @@ PrintCardKeyText: ; 52673 (14:6673)
 .replaceCardKeyDoorTileBlock
 	ld [wNewTileBlockID], a
 	predef ReplaceTileBlock
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
 	ld a, SFX_GO_INSIDE
 	jp PlaySound
diff --git a/engine/play_time.asm b/engine/play_time.asm
index 237883ed..79deaf5e 100755
--- a/engine/play_time.asm
+++ b/engine/play_time.asm
@@ -3,7 +3,7 @@ TrackPlayTime: ; 18dee (6:4dee)
 	ld a, [wd732]
 	bit 0, a
 	ret z
-	ld a, [wPlayTimeMinutes]
+	ld a, [wPlayTimeMaxed]
 	and a
 	ret nz
 	ld a, [wPlayTimeFrames]
@@ -20,20 +20,20 @@ TrackPlayTime: ; 18dee (6:4dee)
 	ret nz
 	xor a
 	ld [wPlayTimeSeconds], a
-	ld a, [wPlayTimeMinutes + 1]
+	ld a, [wPlayTimeMinutes]
 	inc a
-	ld [wPlayTimeMinutes + 1], a
+	ld [wPlayTimeMinutes], a
 	cp 60
 	ret nz
 	xor a
-	ld [wPlayTimeMinutes + 1], a
-	ld a, [wPlayTimeHours + 1]
+	ld [wPlayTimeMinutes], a
+	ld a, [wPlayTimeHours]
 	inc a
-	ld [wPlayTimeHours + 1], a
+	ld [wPlayTimeHours], a
 	cp $ff
 	ret nz
 	ld a, $ff
-	ld [wPlayTimeMinutes], a
+	ld [wPlayTimeMaxed], a
 	ret
 
 CountDownIgnoreInputBitReset: ; 18e36 (6:4e36)
diff --git a/engine/predefs7.asm b/engine/predefs7.asm
index a2c08171..c336eaa9 100755
--- a/engine/predefs7.asm
+++ b/engine/predefs7.asm
@@ -19,7 +19,7 @@ DisplayElevatorFloorMenu: ; 1c9c6 (7:49c6)
 	ld a, b
 	ld [wListScrollOffset], a
 	ret c
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	set 7, [hl]
 	ld hl, wElevatorWarpMaps
 	ld a, [wWhichPokemon]
diff --git a/home.asm b/home.asm
index 81a5fc8a..736e3a42 100644
--- a/home.asm
+++ b/home.asm
@@ -2379,7 +2379,7 @@ StartTrainerBattle:: ; 325d (0:325d)
 	ret
 
 EndTrainerBattle:: ; 3275 (0:3275)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
 	set 6, [hl]
 	ld hl, wd72d
diff --git a/home/overworld.asm b/home/overworld.asm
index 33d66dab..e4f58d4a 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -32,7 +32,7 @@ EnterMap::
 	ld hl, wd72d
 	res 5, [hl]
 	call UpdateSprites
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
 	set 6, [hl]
 	xor a
@@ -317,7 +317,7 @@ OverworldLoopLessDelay::
 	res 6,[hl]
 	ld hl,wFlags_D733
 	res 3,[hl]
-	ld hl,wd126
+	ld hl,wCurrentMapScriptFlags
 	set 5,[hl]
 	set 6,[hl]
 	xor a
diff --git a/scripts/agatha.asm b/scripts/agatha.asm
index 1216f53a..674bbcdc 100755
--- a/scripts/agatha.asm
+++ b/scripts/agatha.asm
@@ -10,7 +10,7 @@ AgathaScript: ; 7642d (1d:642d)
 
 AgathaShowOrHideExitBlock: ; 76443 (1d:6443)
 ; Blocks or clears the exit to the next room.
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
diff --git a/scripts/bruno.asm b/scripts/bruno.asm
index 2135e3de..82551af6 100755
--- a/scripts/bruno.asm
+++ b/scripts/bruno.asm
@@ -10,7 +10,7 @@ BrunoScript: ; 762d6 (1d:62d6)
 
 BrunoShowOrHideExitBlock: ; 762ec (1d:62ec)
 ; Blocks or clears the exit to the next room.
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm
index dd534dba..9a6dcd6d 100755
--- a/scripts/celadongamecorner.asm
+++ b/scripts/celadongamecorner.asm
@@ -7,7 +7,7 @@ CeladonGameCornerScript: ; 48bbd (12:4bbd)
 	jp CallFunctionInTable
 
 CeladonGameCornerScript_48bcf: ; 48bcf (12:4bcf)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
 	ret z
@@ -24,7 +24,7 @@ CeladonGameCornerScript_48bcf: ; 48bcf (12:4bcf)
 	ret
 
 CeladonGameCornerScript_48bec: ; 48bec (12:4bec)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
@@ -109,7 +109,7 @@ CeladonGameCornerScript2: ; 48c69 (12:4c69)
 	ld a, HS_GAME_CORNER_ROCKET
 	ld [wMissableObjectIndex], a
 	predef HideObject
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
 	set 6, [hl]
 	ld a, $0
diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm
index d774ea95..a9c017d0 100755
--- a/scripts/celadongym.asm
+++ b/scripts/celadongym.asm
@@ -1,5 +1,5 @@
 CeladonGymScript: ; 4890a (12:490a)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
 	call nz, CeladonGymScript_48927
diff --git a/scripts/celadonmartelevator.asm b/scripts/celadonmartelevator.asm
index 6d901613..e693d9fe 100755
--- a/scripts/celadonmartelevator.asm
+++ b/scripts/celadonmartelevator.asm
@@ -1,5 +1,5 @@
 CeladonMartElevatorScript: ; 48600 (12:4600)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	push hl
diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm
index 6bdbc298..4b1514b8 100755
--- a/scripts/ceruleangym.asm
+++ b/scripts/ceruleangym.asm
@@ -1,5 +1,5 @@
 CeruleanGymScript: ; 5c6b3 (17:46b3)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
 	call nz, CeruleanGymScript_5c6d0
diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm
index 6b347652..c4905d59 100755
--- a/scripts/cinnabargym.asm
+++ b/scripts/cinnabargym.asm
@@ -6,7 +6,7 @@ CinnabarGymScript: ; 7574a (1d:574a)
 	jp CallFunctionInTable
 
 CinnabarGymScript_75759: ; 75759 (1d:5759)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
 	push hl
@@ -165,7 +165,7 @@ CinnabarGymScript3_75857: ; 75857 (1d:5857)
 	; deactivate gym trainers
 	SetEventRange EVENT_BEAT_CINNABAR_GYM_TRAINER_0, EVENT_BEAT_CINNABAR_GYM_TRAINER_6
 
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
 
 	jp CinnabarGymScript_75792
diff --git a/scripts/cinnabarisland.asm b/scripts/cinnabarisland.asm
index 7f8616b1..ce28fa1e 100755
--- a/scripts/cinnabarisland.asm
+++ b/scripts/cinnabarisland.asm
@@ -1,6 +1,6 @@
 CinnabarIslandScript: ; 1ca19 (7:4a19)
 	call EnableAutoTextBoxDrawing
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
 	ResetEvent EVENT_MANSION_SWITCH_ON
 	ResetEvent EVENT_LAB_STILL_REVIVING_FOSSIL
diff --git a/scripts/fuchsiagym.asm b/scripts/fuchsiagym.asm
index 2788a70a..54c3ae1a 100755
--- a/scripts/fuchsiagym.asm
+++ b/scripts/fuchsiagym.asm
@@ -9,7 +9,7 @@ FuchsiaGymScript: ; 7543d (1d:543d)
 	ret
 
 FuchsiaGymScript_75453: ; 75453 (1d:5453)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
 	ret z
diff --git a/scripts/indigoplateaulobby.asm b/scripts/indigoplateaulobby.asm
index 7655d8c7..e524ed62 100755
--- a/scripts/indigoplateaulobby.asm
+++ b/scripts/indigoplateaulobby.asm
@@ -1,7 +1,7 @@
 IndigoPlateauLobbyScript: ; 19c5b (6:5c5b)
 	call Serial_TryEstablishingExternallyClockedConnection
 	call EnableAutoTextBoxDrawing
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
 	ret z
diff --git a/scripts/lance.asm b/scripts/lance.asm
index 767edb8a..c7d21d43 100755
--- a/scripts/lance.asm
+++ b/scripts/lance.asm
@@ -9,7 +9,7 @@ LanceScript: ; 5a2ae (16:62ae)
 	ret
 
 LanceShowOrHideEntranceBlocks: ; 5a2c4 (16:62c4)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
@@ -71,7 +71,7 @@ LanceScript0: ; 5a305 (16:6305)
 	jr z, WalkToLance
 	CheckAndSetEvent EVENT_LANCES_ROOM_LOCK_DOOR
 	ret nz
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
 	ld a, SFX_GO_INSIDE
 	call PlaySound
diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm
index 1acbffec..12784964 100755
--- a/scripts/lorelei.asm
+++ b/scripts/lorelei.asm
@@ -10,7 +10,7 @@ LoreleiScript: ; 7617b (1d:617b)
 
 LoreleiShowOrHideExitBlock: ; 76191 (1d:6191)
 ; Blocks or clears the exit to the next room.
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
diff --git a/scripts/mansion1.asm b/scripts/mansion1.asm
index 2b14176d..d342c295 100755
--- a/scripts/mansion1.asm
+++ b/scripts/mansion1.asm
@@ -9,7 +9,7 @@ Mansion1Script: ; 442af (11:42af)
 	ret
 
 Mansion1Subscript1: ; 442c5 (11:42c5)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
@@ -106,7 +106,7 @@ Mansion1Text4: ; 4435a (11:435a)
 	jr nz, .asm_4438c
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
 	ld hl, MansionSwitchPressedText
 	call PrintText
diff --git a/scripts/mansion2.asm b/scripts/mansion2.asm
index 5e94fdfc..7fe09e4b 100755
--- a/scripts/mansion2.asm
+++ b/scripts/mansion2.asm
@@ -9,7 +9,7 @@ Mansion2Script: ; 51fd8 (14:5fd8)
 	ret
 
 Mansion2Script_51fee: ; 51fee (14:5fee)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
@@ -112,7 +112,7 @@ Mansion2Text5: ; 52087 (14:6087)
 	jr nz, .asm_520b9
 	ld a, $1
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
 	ld hl, Mansion2Text_520c7
 	call PrintText
diff --git a/scripts/mansion3.asm b/scripts/mansion3.asm
index e3b9993d..049bfeef 100755
--- a/scripts/mansion3.asm
+++ b/scripts/mansion3.asm
@@ -9,7 +9,7 @@ Mansion3Script: ; 521ee (14:61ee)
 	ret
 
 Mansion3Script_52204: ; 52204 (14:6204)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
diff --git a/scripts/mansion4.asm b/scripts/mansion4.asm
index 5d1498bd..c506a407 100755
--- a/scripts/mansion4.asm
+++ b/scripts/mansion4.asm
@@ -9,7 +9,7 @@ Mansion4Script: ; 523b9 (14:63b9)
 	ret
 
 Mansion4Script_523cf: ; 523cf (14:63cf)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm
index 58a74cd2..52e28cb8 100755
--- a/scripts/pewtergym.asm
+++ b/scripts/pewtergym.asm
@@ -1,5 +1,5 @@
 PewterGymScript: ; 5c387 (17:4387)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
 	call nz, PewterGymScript_5c3a4
diff --git a/scripts/rockethideout1.asm b/scripts/rockethideout1.asm
index 7802c89f..d821434d 100755
--- a/scripts/rockethideout1.asm
+++ b/scripts/rockethideout1.asm
@@ -9,7 +9,7 @@ RocketHideout1Script: ; 44bca (11:4bca)
 	ret
 
 RocketHideout1Script_44be0: ; 44be0 (11:4be0)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm
index 23b8c791..44ae7814 100755
--- a/scripts/rockethideout4.asm
+++ b/scripts/rockethideout4.asm
@@ -9,7 +9,7 @@ RocketHideout4Script: ; 4545d (11:545d)
 	ret
 
 RocketHideout4Script_45473: ; 45473 (11:5473)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
@@ -65,7 +65,7 @@ RocketHideout4Script3: ; 454b6 (11:54b6)
 	call GBFadeInFromBlack
 	xor a
 	ld [wJoyIgnore], a
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
 	ld a, $0
 	ld [wRocketHideout4CurScript], a
diff --git a/scripts/rockethideoutelevator.asm b/scripts/rockethideoutelevator.asm
index 8a0ca049..c90b0aad 100755
--- a/scripts/rockethideoutelevator.asm
+++ b/scripts/rockethideoutelevator.asm
@@ -1,5 +1,5 @@
 RocketHideoutElevatorScript: ; 45710 (11:5710)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	push hl
diff --git a/scripts/route23.asm b/scripts/route23.asm
index 10bae669..ca72c9fe 100755
--- a/scripts/route23.asm
+++ b/scripts/route23.asm
@@ -6,7 +6,7 @@ Route23Script: ; 511da (14:51da)
 	jp CallFunctionInTable
 
 Route23Script_511e9: ; 511e9 (14:51e9)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
 	ret z
diff --git a/scripts/route25.asm b/scripts/route25.asm
index 4df7fd40..15b52b81 100755
--- a/scripts/route25.asm
+++ b/scripts/route25.asm
@@ -9,7 +9,7 @@ Route25Script: ; 515cb (14:55cb)
 	ret
 
 Route25Script_515e1: ; 515e1 (14:55e1)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
 	ret z
diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm
index 54aea876..aae06103 100755
--- a/scripts/saffrongym.asm
+++ b/scripts/saffrongym.asm
@@ -1,5 +1,5 @@
 SaffronGymScript: ; 5d00d (17:500d)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
 	call nz, .extra
diff --git a/scripts/silphco10.asm b/scripts/silphco10.asm
index 5ca16e04..e254765d 100755
--- a/scripts/silphco10.asm
+++ b/scripts/silphco10.asm
@@ -9,7 +9,7 @@ SilphCo10Script: ; 5a139 (16:6139)
 	ret
 
 SilphCo10Script_5a14f: ; 5a14f (16:614f)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm
index 79a2c328..10a74853 100755
--- a/scripts/silphco11.asm
+++ b/scripts/silphco11.asm
@@ -9,7 +9,7 @@ SilphCo11Script: ; 620fa (18:60fa)
 	ret
 
 SilphCo11Script_62110: ; 62110 (18:6110)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
diff --git a/scripts/silphco2.asm b/scripts/silphco2.asm
index 7fbd81c8..42a5f3c0 100755
--- a/scripts/silphco2.asm
+++ b/scripts/silphco2.asm
@@ -9,7 +9,7 @@ SilphCo2Script: ; 59cf1 (16:5cf1)
 	ret
 
 SilphCo2Script_59d07: ; 59d07 (16:5d07)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
diff --git a/scripts/silphco3.asm b/scripts/silphco3.asm
index 119d7c66..68ae7ed2 100755
--- a/scripts/silphco3.asm
+++ b/scripts/silphco3.asm
@@ -9,7 +9,7 @@ SilphCo3Script: ; 59f5b (16:5f5b)
 	ret
 
 SilphCo3Script_59f71: ; 59f71 (16:5f71)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
diff --git a/scripts/silphco4.asm b/scripts/silphco4.asm
index 38de73a7..12e04f69 100755
--- a/scripts/silphco4.asm
+++ b/scripts/silphco4.asm
@@ -9,7 +9,7 @@ SilphCo4Script: ; 19d0b (6:5d0b)
 	ret
 
 SilphCo4Script_19d21: ; 19d21 (6:5d21)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
diff --git a/scripts/silphco5.asm b/scripts/silphco5.asm
index 080ed963..d09848ba 100755
--- a/scripts/silphco5.asm
+++ b/scripts/silphco5.asm
@@ -9,7 +9,7 @@ SilphCo5Script: ; 19f37 (6:5f37)
 	ret
 
 SilphCo5Script_19f4d: ; 19f4d (6:5f4d)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
diff --git a/scripts/silphco6.asm b/scripts/silphco6.asm
index 6d7978b2..406bc373 100755
--- a/scripts/silphco6.asm
+++ b/scripts/silphco6.asm
@@ -9,7 +9,7 @@ SilphCo6Script: ; 1a1a9 (6:61a9)
 	ret
 
 SilphCo6Script_1a1bf: ; 1a1bf (6:61bf)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm
index f771f865..e5d610fb 100755
--- a/scripts/silphco7.asm
+++ b/scripts/silphco7.asm
@@ -9,7 +9,7 @@ SilphCo7Script: ; 51b61 (14:5b61)
 	ret
 
 SilphCo7Script_51b77: ; 51b77 (14:5b77)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
diff --git a/scripts/silphco8.asm b/scripts/silphco8.asm
index bb3217ec..86f02b60 100755
--- a/scripts/silphco8.asm
+++ b/scripts/silphco8.asm
@@ -9,7 +9,7 @@ SilphCo8Script: ; 56504 (15:6504)
 	ret
 
 SilphCo8Script_5651a: ; 5651a (15:651a)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
diff --git a/scripts/silphco9.asm b/scripts/silphco9.asm
index 2ab7423b..589a086e 100755
--- a/scripts/silphco9.asm
+++ b/scripts/silphco9.asm
@@ -9,7 +9,7 @@ SilphCo9Script: ; 5d7bb (17:57bb)
 	ret
 
 SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
diff --git a/scripts/silphcoelevator.asm b/scripts/silphcoelevator.asm
index d080cfef..386cd2e8 100755
--- a/scripts/silphcoelevator.asm
+++ b/scripts/silphcoelevator.asm
@@ -1,5 +1,5 @@
 SilphCoElevatorScript: ; 457c0 (11:57c0)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	push hl
diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm
index 66df8021..d1516b6a 100755
--- a/scripts/vermilioncity.asm
+++ b/scripts/vermilioncity.asm
@@ -1,6 +1,6 @@
 VermilionCityScript: ; 197a1 (6:57a1)
 	call EnableAutoTextBoxDrawing
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
 	push hl
diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm
index 15791f0e..cd2b5b3c 100755
--- a/scripts/vermiliongym.asm
+++ b/scripts/vermiliongym.asm
@@ -1,5 +1,5 @@
 VermilionGymScript: ; 5ca26 (17:4a26)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	push hl
diff --git a/scripts/victoryroad1.asm b/scripts/victoryroad1.asm
index e66cc375..af0c3c3e 100755
--- a/scripts/victoryroad1.asm
+++ b/scripts/victoryroad1.asm
@@ -1,5 +1,5 @@
 VictoryRoad1Script: ; 5da0a (17:5a0a)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	call nz, .next
@@ -29,7 +29,7 @@ VictoryRoad1Script0: ; 5da40 (17:5a40)
 	ld hl, CoordsData_5da5c
 	call CheckBoulderCoords
 	jp nc, CheckFightingMapTrainers
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
 	SetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH
 	ret
diff --git a/scripts/victoryroad2.asm b/scripts/victoryroad2.asm
index 6fc4747c..c1fc6dc7 100755
--- a/scripts/victoryroad2.asm
+++ b/scripts/victoryroad2.asm
@@ -1,9 +1,9 @@
 VictoryRoad2Script: ; 5179d (14:579d)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
 	call nz, VictoryRoad2Script_517c4
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	call nz, VictoryRoad2Script_517c9
@@ -59,7 +59,7 @@ VictoryRoad2Script0: ; 517f1 (14:57f1)
 	SetEventReuseHL EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2
 	ret nz
 .asm_51810
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
 	ret
 
diff --git a/scripts/victoryroad3.asm b/scripts/victoryroad3.asm
index 40117398..4cdf3fb0 100755
--- a/scripts/victoryroad3.asm
+++ b/scripts/victoryroad3.asm
@@ -9,7 +9,7 @@ VictoryRoad3Script: ; 44980 (11:4980)
 	ret
 
 VictoryRoad3Script_44996: ; 44996 (11:4996)
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	ret z
@@ -36,7 +36,7 @@ VictoryRoad3Script0: ; 449b7 (11:49b7)
 	ld a, [wCoordIndex]
 	cp $1
 	jr nz, .asm_449dc
-	ld hl, wd126
+	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
 	SetEvent EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1
 	ret
diff --git a/wram.asm b/wram.asm
index 2610e59f..1bc8968d 100755
--- a/wram.asm
+++ b/wram.asm
@@ -2118,7 +2118,7 @@ wIsKeyItem:: ; d124
 wTextBoxID:: ; d125
 	ds 1
 
-wd126:: ds 1 ; not exactly sure what this is used for, but it seems to be used as a multipurpose temp flag value
+wCurrentMapScriptFlags:: ds 1 ; not exactly sure what this is used for, but it seems to be used as a multipurpose temp flag value
 
 wCurEnemyLVL:: ; d127
 	ds 1
@@ -2308,7 +2308,7 @@ wOptions:: ; d355
 	ds 1
 
 wObtainedBadges:: ; d356
-	ds 1
+	flag_array 8
 
 	ds 1
 
@@ -3107,12 +3107,14 @@ wCurMapScript:: ; da39
 ; mostly copied from map-specific map script pointer and wirtten back later
 	ds 1
 
-	ds 6
+	ds 7
 
-wPlayTimeHours:: ; da40
-	ds 2
-wPlayTimeMinutes:: ; da42
-	ds 2
+wPlayTimeHours:: ; da41
+	ds 1
+wPlayTimeMaxed:: ; da42
+	ds 1
+wPlayTimeMinutes:: ; da43
+	ds 1
 wPlayTimeSeconds:: ; da44
 	ds 1
 wPlayTimeFrames:: ; da45