thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 18:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
Show stats 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]

2
home.asm
View file

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

4
home/overworld.asm
View file

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

2
scripts/agatha.asm
View file

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

2
scripts/bruno.asm
View file

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

6
scripts/celadongamecorner.asm
View file

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

2
scripts/celadongym.asm
View file

@ -1,5 +1,5 @@
CeladonGymScript: ; 4890a (12:490a)
ld hl, wd126
ld hl, wCurrentMapScriptFlags
bit 6, [hl]
res 6, [hl]
call nz, CeladonGymScript_48927

2
scripts/celadonmartelevator.asm
View file

@ -1,5 +1,5 @@
CeladonMartElevatorScript: ; 48600 (12:4600)
ld hl, wd126
ld hl, wCurrentMapScriptFlags
bit 5, [hl]
res 5, [hl]
push hl

2
scripts/ceruleangym.asm
View file

@ -1,5 +1,5 @@
CeruleanGymScript: ; 5c6b3 (17:46b3)
ld hl, wd126
ld hl, wCurrentMapScriptFlags
bit 6, [hl]
res 6, [hl]
call nz, CeruleanGymScript_5c6d0

4
scripts/cinnabargym.asm
View file

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

2
scripts/cinnabarisland.asm
View file

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

2
scripts/fuchsiagym.asm
View file

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

2
scripts/indigoplateaulobby.asm
View file

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

4
scripts/lance.asm
View file

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

2
scripts/lorelei.asm
View file

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

4
scripts/mansion1.asm
View file

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

4
scripts/mansion2.asm
View file

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

2
scripts/mansion3.asm
View file

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

2
scripts/mansion4.asm
View file

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

2
scripts/pewtergym.asm
View file

@ -1,5 +1,5 @@
PewterGymScript: ; 5c387 (17:4387)
ld hl, wd126
ld hl, wCurrentMapScriptFlags
bit 6, [hl]
res 6, [hl]
call nz, PewterGymScript_5c3a4

2
scripts/rockethideout1.asm
View file

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

4
scripts/rockethideout4.asm
View file

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

2
scripts/rockethideoutelevator.asm
View file

@ -1,5 +1,5 @@
RocketHideoutElevatorScript: ; 45710 (11:5710)
ld hl, wd126
ld hl, wCurrentMapScriptFlags
bit 5, [hl]
res 5, [hl]
push hl

2
scripts/route23.asm
View file

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

2
scripts/route25.asm
View file

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

2
scripts/saffrongym.asm
View file

@ -1,5 +1,5 @@
SaffronGymScript: ; 5d00d (17:500d)
ld hl, wd126
ld hl, wCurrentMapScriptFlags
bit 6, [hl]
res 6, [hl]
call nz, .extra

2
scripts/silphco10.asm
View file

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

2
scripts/silphco11.asm
View file

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

2
scripts/silphco2.asm
View file

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

2
scripts/silphco3.asm
View file

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

2
scripts/silphco4.asm
View file

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

2
scripts/silphco5.asm
View file

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

2
scripts/silphco6.asm
View file

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

2
scripts/silphco7.asm
View file

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

2
scripts/silphco8.asm
View file

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

2
scripts/silphco9.asm
View file

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

2
scripts/silphcoelevator.asm
View file

@ -1,5 +1,5 @@
SilphCoElevatorScript: ; 457c0 (11:57c0)
ld hl, wd126
ld hl, wCurrentMapScriptFlags
bit 5, [hl]
res 5, [hl]
push hl

2
scripts/vermilioncity.asm
View file

@ -1,6 +1,6 @@
VermilionCityScript: ; 197a1 (6:57a1)
call EnableAutoTextBoxDrawing
ld hl, wd126
ld hl, wCurrentMapScriptFlags
bit 6, [hl]
res 6, [hl]
push hl

2
scripts/vermiliongym.asm
View file

@ -1,5 +1,5 @@
VermilionGymScript: ; 5ca26 (17:4a26)
ld hl, wd126
ld hl, wCurrentMapScriptFlags
bit 5, [hl]
res 5, [hl]
push hl

4
scripts/victoryroad1.asm
View file

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

6
scripts/victoryroad2.asm
View file

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

4
scripts/victoryroad3.asm
View file

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

16
wram.asm
View file

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