diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-25 22:39:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-25 22:39:51 -0500 |
| commit | 725148443f0ed0f70af747259ef49643359e92a2 (patch) | |
| tree | 5f8ccf80489e0820934d40a732a5ce8d7f65e1e3 /home/tilemap.asm | |
| parent | f44f306cfd4b438d0ba2f56b61be4b118ef3274b (diff) | |
| parent | 7453bd1aa8e55a1a9fcce7c69f62106f5e5f6e9c (diff) | |
Merge pull request #476 from Rangi42/master
Resolve some issues; rename some maps; move more tables into data/; warp_def → warp_event (ready to merge)
Diffstat (limited to 'home/tilemap.asm')
| -rw-r--r-- | home/tilemap.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/home/tilemap.asm b/home/tilemap.asm index 4bbd16102..aceb00343 100644 --- a/home/tilemap.asm +++ b/home/tilemap.asm @@ -79,17 +79,17 @@ GetMenuBoxDims:: ; 0x1c53 ret ; 0x1c66 -CopyMenuData2:: ; 1c66 +CopyMenuData:: ; 1c66 push hl push de push bc push af - ld hl, wMenuData2Pointer + ld hl, wMenuDataPointer ld a, [hli] ld h, [hl] ld l, a - ld de, wMenuData2Flags - ld bc, wMenuData2End - wMenuData2Flags + ld de, wMenuDataFlags + ld bc, wMenuDataEnd - wMenuDataFlags call CopyBytes pop af pop bc @@ -111,8 +111,8 @@ GetWindowStackTop:: ; 1c7e ; 1c89 PlaceVerticalMenuItems:: ; 1c89 - call CopyMenuData2 - ld hl, wMenuData2Pointer + call CopyMenuData + ld hl, wMenuDataPointer ld e, [hl] inc hl ld d, [hl] @@ -132,7 +132,7 @@ PlaceVerticalMenuItems:: ; 1c89 dec b jr nz, .loop - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 4, a ret z @@ -161,14 +161,14 @@ GetMenuTextStartCoord:: ; 1cc6 ld c, a inc c ; bit 6: if not set, leave extra room on top - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 6, a jr nz, .bit_6_set inc b .bit_6_set ; bit 7: if set, leave extra room on the left - ld a, [wMenuData2Flags] + ld a, [wMenuDataFlags] bit 7, a jr z, .bit_7_clear inc c |