diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-01-04 20:08:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-04 20:08:43 -0500 |
| commit | 94ebdab6d350fd6ebfd43c5a84710ed14dade8ca (patch) | |
| tree | a3b0d23a7501a337fb150ffb9253b3d5a301c657 /home/map.asm | |
| parent | 9aeb0ab522ad36796b2ace55cca17e7314a3bc9a (diff) | |
| parent | 739a60b33c54021c975f22d627e4b5e40206fe37 (diff) | |
Merge pull request #660 from mid-kid/master
Make the map setup commands match the actual function names better
Diffstat (limited to 'home/map.asm')
| -rw-r--r-- | home/map.asm | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/home/map.asm b/home/map.asm index b7fdb55b8..5fd2fcc27 100644 --- a/home/map.asm +++ b/home/map.asm @@ -381,11 +381,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 @@ -657,7 +657,7 @@ ClearObjectStructs:: jr nz, .loop ret -RestoreFacingAfterWarp:: +GetWarpDestCoords:: call GetMapScriptsBank rst Bankswitch @@ -685,7 +685,7 @@ endr call .backup .skip - farcall GetCoordOfUpperLeftCorner + farcall GetMapScreenCoords ret .backup @@ -1438,7 +1438,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 @@ -1450,9 +1450,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] @@ -1464,7 +1464,7 @@ LoadNeighboringBlockData:: ld b, SCREEN_META_WIDTH ld c, SCREEN_META_HEIGHT -SaveScreen_LoadNeighbor:: +SaveScreen_LoadConnection:: .row push bc push hl @@ -1481,7 +1481,6 @@ SaveScreen_LoadNeighbor:: ld e, a jr nc, .okay inc d - .okay pop hl ldh a, [hConnectionStripLength] @@ -2260,7 +2259,7 @@ GetFishingGroup:: pop de ret -LoadTileset:: +LoadMapTileset:: push hl push bc |