Improve some innacurate function names, labels, and comments (#1078)

[https://github.com/pret/pokecrystal/issues/1078#issuecomment-1872396250]
This commit is contained in:
xCrystal
2024-01-07 13:27:26 +01:00
parent bd6ceec193
commit cd28c44ff3
11 changed files with 58 additions and 58 deletions

View File

@@ -33,7 +33,7 @@ GameTimer::
; Is the timer paused?
ld hl, wGameTimerPaused
bit GAME_TIMER_PAUSED_F, [hl]
bit GAME_TIMER_COUNTING_F, [hl]
ret z
; Is the timer already capped?

View File

@@ -252,12 +252,12 @@ GetDestinationWarpNumber::
ld a, [wPlayerMapX]
sub 4
ld d, a
ld a, [wCurMapWarpCount]
ld a, [wCurMapWarpEventCount]
and a
ret z
ld c, a
ld hl, wCurMapWarpsPointer
ld hl, wCurMapWarpEventsPointer
ld a, [hli]
ld h, [hl]
ld l, a
@@ -290,7 +290,7 @@ GetDestinationWarpNumber::
call .IncreaseHLTwice
ret nc ; never encountered
ld a, [wCurMapWarpCount]
ld a, [wCurMapWarpEventCount]
inc a
sub c
ld c, a
@@ -317,7 +317,7 @@ CopyWarpData::
.CopyWarpData:
push bc
ld hl, wCurMapWarpsPointer
ld hl, wCurMapWarpEventsPointer
ld a, [hli]
ld h, [hl]
ld l, a
@@ -406,7 +406,7 @@ ReadMapEvents::
ld l, a
inc hl
inc hl
call ReadWarps
call ReadWarpEvents
call ReadCoordEvents
call ReadBGEvents
@@ -516,14 +516,14 @@ ReadMapCallbacks::
call AddNTimes
ret
ReadWarps::
ReadWarpEvents::
ld a, [hli]
ld c, a
ld [wCurMapWarpCount], a
ld [wCurMapWarpEventCount], a
ld a, l
ld [wCurMapWarpsPointer], a
ld [wCurMapWarpEventsPointer], a
ld a, h
ld [wCurMapWarpsPointer + 1], a
ld [wCurMapWarpEventsPointer + 1], a
ld a, c
and a
ret z

View File

@@ -56,11 +56,11 @@ HandleStoneQueue::
ret
.check_on_warp
ld hl, wCurMapWarpsPointer
ld hl, wCurMapWarpEventsPointer
ld a, [hli]
ld h, [hl]
ld l, a
ld a, [wCurMapWarpCount]
ld a, [wCurMapWarpEventCount]
and a
jr z, .nope2
@@ -94,7 +94,7 @@ HandleStoneQueue::
.found_warp
pop af
ld d, a
ld a, [wCurMapWarpCount]
ld a, [wCurMapWarpEventCount]
sub d
inc a
scf