diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/hall_of_fame.asm | 4 | ||||
| -rwxr-xr-x | engine/hidden_object_functions17.asm | 2 | ||||
| -rwxr-xr-x | engine/hidden_object_functions7.asm | 2 | ||||
| -rwxr-xr-x | engine/menu/main_menu.asm | 6 | ||||
| -rwxr-xr-x | engine/menu/start_sub_menus.asm | 4 | ||||
| -rwxr-xr-x | engine/overworld/card_key.asm | 2 | ||||
| -rwxr-xr-x | engine/play_time.asm | 14 | ||||
| -rwxr-xr-x | engine/predefs7.asm | 2 |
8 files changed, 18 insertions, 18 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] |