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

[https://github.com/pret/pokecrystal/issues/1078#issue-1869550979 and https://github.com/pret/pokecrystal/issues/1078#issuecomment-1696394371]
This commit is contained in:
xCrystal
2024-01-07 12:38:00 +01:00
parent dbf6044650
commit bd6ceec193
107 changed files with 340 additions and 337 deletions

View File

@@ -1131,11 +1131,9 @@ TryTileCollisionEvent::
ret
RandomEncounter::
; Random encounter
call CheckWildEncounterCooldown
jr c, .nope
call CanUseSweetScent
call CanEncounterWildMonInThisTile
jr nc, .nope
ld hl, wStatusFlags2
bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
@@ -1175,7 +1173,7 @@ WildBattleScript:
reloadmapafterbattle
end
CanUseSweetScent::
CanEncounterWildMonInThisTile::
ld hl, wStatusFlags
bit STATUSFLAGS_NO_WILD_ENCOUNTERS_F, [hl]
jr nz, .no

View File

@@ -27,10 +27,10 @@ ReanchorBGMap_NoOAMUpdate::
ldh [hBGMapMode], a
ld a, $90
ldh [hWY], a
call OverworldTextModeSwitch
call LoadOverworldTilemapAndAttrmapPals
ld a, HIGH(vBGMap1)
call .LoadBGMapAddrIntoHRAM
call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
call HDMATransferTilemapAndAttrmap_Menu
farcall LoadOW_BGPal7
farcall ApplyPals
ld a, TRUE

View File

@@ -1,4 +1,6 @@
_LoadMapPart::
_LoadOverworldTilemap::
; From the metatile-based 24x20 map in wSurroundingTiles,
; load the corresponding 20x18 tiles to wTilemap.
ld hl, wSurroundingTiles
ld a, [wPlayerMetatileY]
and a

View File

@@ -13,7 +13,7 @@ BlankScreen:
ld a, $7
call ByteFill
call WaitBGMap2
call SetPalettes
call SetDefaultBGPAndOBP
ret
SpawnPlayer:

View File

@@ -125,25 +125,25 @@ UpdateOverworldMap:
.step_down
call .ScrollOverworldMapDown
call LoadMapPart
call LoadOverworldTilemap
call ScrollMapDown
ret
.step_up
call .ScrollOverworldMapUp
call LoadMapPart
call LoadOverworldTilemap
call ScrollMapUp
ret
.step_left
call .ScrollOverworldMapLeft
call LoadMapPart
call LoadOverworldTilemap
call ScrollMapLeft
ret
.step_right
call .ScrollOverworldMapRight
call LoadMapPart
call LoadOverworldTilemap
call ScrollMapRight
ret

View File

@@ -939,7 +939,7 @@ ApplyObjectFacing:
ret
.DisableTextTiles:
call LoadMapPart
call LoadOverworldTilemap
hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
.loop
@@ -2160,9 +2160,9 @@ Script_changeblock:
Script_reloadmappart::
xor a
ldh [hBGMapMode], a
call OverworldTextModeSwitch
call LoadOverworldTilemapAndAttrmapPals
call GetMovementPermissions
farcall ReloadMapPart
farcall HDMATransferTilemapAndAttrmap_Overworld
call UpdateSprites
ret
@@ -2206,7 +2206,7 @@ UnusedClosetextScript: ; unreferenced
closetext
Script_closetext:
call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap
call HDMATransferTilemapAndAttrmap_Menu
call CloseText
ret

View File

@@ -232,7 +232,7 @@ LoadMapTimeOfDay:
ld [wSpriteUpdatesEnabled], a
farcall ReplaceTimeOfDayPals
farcall UpdateTimeOfDayPal
call OverworldTextModeSwitch
call LoadOverworldTilemapAndAttrmapPals
call .ClearBGMap
call .PushAttrmap
ret