thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 23:55:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix game time labels

Browse source
This commit is contained in:
PikalaxALT 2016-01-03 14:17:10 -05:00
parent 1a5a108bdf
commit 28dc5686b0
50 changed files with 80 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engine/hall_of_fame.asm
View file

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

2
engine/hidden_object_functions17.asm
View file

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

2
engine/hidden_object_functions7.asm
View file

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

6
engine/menu/main_menu.asm
View file

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

4
engine/menu/start_sub_menus.asm
View file

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

2
engine/overworld/card_key.asm
View file

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

14
engine/play_time.asm
View file

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

2
engine/predefs7.asm
View file

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