Make the map setup commands match the actual function names better
These functions used as map setup commands are used in other places, too, so I can't prefix them under the same. The names should match except I won't repeat "map" in a map setup command name.
This commit is contained in:
19
home/map.asm
19
home/map.asm
@@ -380,11 +380,11 @@ LoadMapAttributes::
|
||||
call CopyMapPartialAndAttributes
|
||||
call SwitchToMapScriptsBank
|
||||
call ReadMapScripts
|
||||
xor a ; do not skip object_events
|
||||
xor a ; do not skip object events
|
||||
call ReadMapEvents
|
||||
ret
|
||||
|
||||
LoadMapAttributes_SkipPeople::
|
||||
LoadMapAttributes_SkipObjects::
|
||||
call CopyMapPartialAndAttributes
|
||||
call SwitchToMapScriptsBank
|
||||
call ReadMapScripts
|
||||
@@ -656,7 +656,7 @@ ClearObjectStructs::
|
||||
jr nz, .loop
|
||||
ret
|
||||
|
||||
RestoreFacingAfterWarp::
|
||||
GetWarpDestCoords::
|
||||
call GetMapScriptsBank
|
||||
rst Bankswitch
|
||||
|
||||
@@ -684,7 +684,7 @@ endr
|
||||
call .backup
|
||||
|
||||
.skip
|
||||
farcall GetCoordOfUpperLeftCorner
|
||||
farcall GetMapScreenCoords
|
||||
ret
|
||||
|
||||
.backup
|
||||
@@ -1437,7 +1437,7 @@ SaveScreen::
|
||||
.vertical
|
||||
ld b, SCREEN_META_WIDTH
|
||||
ld c, SCREEN_META_HEIGHT - 1
|
||||
jr SaveScreen_LoadNeighbor
|
||||
jr SaveScreen_LoadConnection
|
||||
|
||||
.left
|
||||
ld de, wScreenSave + 1
|
||||
@@ -1449,9 +1449,9 @@ SaveScreen::
|
||||
.horizontal
|
||||
ld b, SCREEN_META_WIDTH - 1
|
||||
ld c, SCREEN_META_HEIGHT
|
||||
jr SaveScreen_LoadNeighbor
|
||||
jr SaveScreen_LoadConnection
|
||||
|
||||
LoadNeighboringBlockData::
|
||||
LoadConnectionBlockData::
|
||||
ld hl, wOverworldMapAnchor
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
@@ -1463,7 +1463,7 @@ LoadNeighboringBlockData::
|
||||
ld b, SCREEN_META_WIDTH
|
||||
ld c, SCREEN_META_HEIGHT
|
||||
|
||||
SaveScreen_LoadNeighbor::
|
||||
SaveScreen_LoadConnection::
|
||||
.row
|
||||
push bc
|
||||
push hl
|
||||
@@ -1480,7 +1480,6 @@ SaveScreen_LoadNeighbor::
|
||||
ld e, a
|
||||
jr nc, .okay
|
||||
inc d
|
||||
|
||||
.okay
|
||||
pop hl
|
||||
ldh a, [hConnectionStripLength]
|
||||
@@ -2259,7 +2258,7 @@ GetFishingGroup::
|
||||
pop de
|
||||
ret
|
||||
|
||||
LoadTileset::
|
||||
LoadMapTileset::
|
||||
push hl
|
||||
push bc
|
||||
|
||||
|
Reference in New Issue
Block a user