Improve some innacurate function names, labels, and comments (#1078)
[https://github.com/pret/pokecrystal/issues/1078#issuecomment-1872396250]
This commit is contained in:
@@ -22,76 +22,76 @@ OverworldLoop::
|
||||
|
||||
DisableEvents:
|
||||
xor a
|
||||
ld [wScriptFlags2], a
|
||||
ld [wEnabledPlayerEvents], a
|
||||
ret
|
||||
|
||||
EnableEvents::
|
||||
ld a, $ff
|
||||
ld [wScriptFlags2], a
|
||||
ld [wEnabledPlayerEvents], a
|
||||
ret
|
||||
|
||||
CheckBit5_ScriptFlags2:
|
||||
ld hl, wScriptFlags2
|
||||
CheckEnabledMapEventsBit5:
|
||||
ld hl, wEnabledPlayerEvents
|
||||
bit 5, [hl]
|
||||
ret
|
||||
|
||||
DisableWarpsConnxns: ; unreferenced
|
||||
ld hl, wScriptFlags2
|
||||
DisableWarpsConnections: ; unreferenced
|
||||
ld hl, wEnabledPlayerEvents
|
||||
res 2, [hl]
|
||||
ret
|
||||
|
||||
DisableCoordEvents: ; unreferenced
|
||||
ld hl, wScriptFlags2
|
||||
ld hl, wEnabledPlayerEvents
|
||||
res 1, [hl]
|
||||
ret
|
||||
|
||||
DisableStepCount: ; unreferenced
|
||||
ld hl, wScriptFlags2
|
||||
ld hl, wEnabledPlayerEvents
|
||||
res 0, [hl]
|
||||
ret
|
||||
|
||||
DisableWildEncounters: ; unreferenced
|
||||
ld hl, wScriptFlags2
|
||||
ld hl, wEnabledPlayerEvents
|
||||
res 4, [hl]
|
||||
ret
|
||||
|
||||
EnableWarpsConnxns: ; unreferenced
|
||||
ld hl, wScriptFlags2
|
||||
EnableWarpsConnections: ; unreferenced
|
||||
ld hl, wEnabledPlayerEvents
|
||||
set 2, [hl]
|
||||
ret
|
||||
|
||||
EnableCoordEvents: ; unreferenced
|
||||
ld hl, wScriptFlags2
|
||||
ld hl, wEnabledPlayerEvents
|
||||
set 1, [hl]
|
||||
ret
|
||||
|
||||
EnableStepCount: ; unreferenced
|
||||
ld hl, wScriptFlags2
|
||||
ld hl, wEnabledPlayerEvents
|
||||
set 0, [hl]
|
||||
ret
|
||||
|
||||
EnableWildEncounters:
|
||||
ld hl, wScriptFlags2
|
||||
ld hl, wEnabledPlayerEvents
|
||||
set 4, [hl]
|
||||
ret
|
||||
|
||||
CheckWarpConnxnScriptFlag:
|
||||
ld hl, wScriptFlags2
|
||||
CheckWarpConnectionsEnabled:
|
||||
ld hl, wEnabledPlayerEvents
|
||||
bit 2, [hl]
|
||||
ret
|
||||
|
||||
CheckCoordEventScriptFlag:
|
||||
ld hl, wScriptFlags2
|
||||
CheckCoordEventsEnabled:
|
||||
ld hl, wEnabledPlayerEvents
|
||||
bit 1, [hl]
|
||||
ret
|
||||
|
||||
CheckStepCountScriptFlag:
|
||||
ld hl, wScriptFlags2
|
||||
CheckStepCountEnabled:
|
||||
ld hl, wEnabledPlayerEvents
|
||||
bit 0, [hl]
|
||||
ret
|
||||
|
||||
CheckWildEncountersScriptFlag:
|
||||
ld hl, wScriptFlags2
|
||||
CheckWildEncountersEnabled:
|
||||
ld hl, wEnabledPlayerEvents
|
||||
bit 4, [hl]
|
||||
ret
|
||||
|
||||
@@ -245,9 +245,9 @@ PlayerEvents:
|
||||
and a
|
||||
ret nz
|
||||
|
||||
call Dummy_CheckScriptFlags2Bit5 ; This is a waste of time
|
||||
call Dummy_CheckEnabledMapEventsBit5 ; This is a waste of time
|
||||
|
||||
call CheckTrainerBattle_GetPlayerEvent
|
||||
call CheckTrainerEvent
|
||||
jr c, .ok
|
||||
|
||||
call CheckTileEvent
|
||||
@@ -288,7 +288,7 @@ PlayerEvents:
|
||||
scf
|
||||
ret
|
||||
|
||||
CheckTrainerBattle_GetPlayerEvent:
|
||||
CheckTrainerEvent:
|
||||
nop
|
||||
nop
|
||||
call CheckTrainerBattle
|
||||
@@ -305,7 +305,7 @@ CheckTrainerBattle_GetPlayerEvent:
|
||||
CheckTileEvent:
|
||||
; Check for warps, coord events, or wild battles.
|
||||
|
||||
call CheckWarpConnxnScriptFlag
|
||||
call CheckWarpConnectionsEnabled
|
||||
jr z, .connections_disabled
|
||||
|
||||
farcall CheckMovingOffEdgeOfMap
|
||||
@@ -315,21 +315,21 @@ CheckTileEvent:
|
||||
jr c, .warp_tile
|
||||
|
||||
.connections_disabled
|
||||
call CheckCoordEventScriptFlag
|
||||
call CheckCoordEventsEnabled
|
||||
jr z, .coord_events_disabled
|
||||
|
||||
call CheckCurrentMapCoordEvents
|
||||
jr c, .coord_event
|
||||
|
||||
.coord_events_disabled
|
||||
call CheckStepCountScriptFlag
|
||||
call CheckStepCountEnabled
|
||||
jr z, .step_count_disabled
|
||||
|
||||
call CountStep
|
||||
ret c
|
||||
|
||||
.step_count_disabled
|
||||
call CheckWildEncountersScriptFlag
|
||||
call CheckWildEncountersEnabled
|
||||
jr z, .ok
|
||||
|
||||
call RandomEncounter
|
||||
@@ -392,8 +392,8 @@ SetMinTwoStepWildEncounterCooldown:
|
||||
ld [wWildEncounterCooldown], a
|
||||
ret
|
||||
|
||||
Dummy_CheckScriptFlags2Bit5:
|
||||
call CheckBit5_ScriptFlags2
|
||||
Dummy_CheckEnabledMapEventsBit5:
|
||||
call CheckEnabledMapEventsBit5
|
||||
ret z
|
||||
call SetXYCompareFlags
|
||||
ret
|
||||
@@ -1059,7 +1059,7 @@ RunMemScript::
|
||||
pop af
|
||||
ret
|
||||
|
||||
LoadScriptBDE::
|
||||
LoadMemScript::
|
||||
; If there's already a script here, don't overwrite.
|
||||
ld hl, wMapReentryScriptQueueFlag
|
||||
ld a, [hl]
|
||||
@@ -1126,7 +1126,7 @@ TryTileCollisionEvent::
|
||||
|
||||
.done
|
||||
call PlayClickSFX
|
||||
ld a, $ff
|
||||
ld a, PLAYEREVENT_MAPSCRIPT
|
||||
scf
|
||||
ret
|
||||
|
||||
|
Reference in New Issue
Block a user