pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix overworld scrolling function names

Browse Source
This commit is contained in:
mid-kid 2019-06-06 23:59:13 +02:00
parent 7b47aeaf79
commit c7fdf5f9ec
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
engine/overworld/player_step.asm
View File

@ -126,25 +126,25 @@ UpdateOverworldMap:
.step_down .step_down
call .ScrollOverworldMapDown call .ScrollOverworldMapDown
call LoadMapPart call LoadMapPart
call ScrollMapUp call ScrollMapDown
ret ret
.step_up .step_up
call .ScrollOverworldMapUp call .ScrollOverworldMapUp
call LoadMapPart call LoadMapPart
call ScrollMapDown call ScrollMapUp
ret ret
.step_left .step_left
call .ScrollOverworldMapLeft call .ScrollOverworldMapLeft
call LoadMapPart call LoadMapPart
call ScrollMapRight call ScrollMapLeft
ret ret
.step_right .step_right
call .ScrollOverworldMapRight call .ScrollOverworldMapRight
call LoadMapPart call LoadMapPart
call ScrollMapLeft call ScrollMapRight
ret ret
.ScrollOverworldMapDown: .ScrollOverworldMapDown:
@ -164,14 +164,14 @@ UpdateOverworldMap:
cp 2 ; was 1 cp 2 ; was 1
jr nz, .done_down jr nz, .done_down
ld [hl], 0 ld [hl], 0
call .Add6ToOverworldMapAnchor call .ScrollMapDataDown
.done_down .done_down
ret ret
.Add6ToOverworldMapAnchor: .ScrollMapDataDown:
ld hl, wOverworldMapAnchor ld hl, wOverworldMapAnchor
ld a, [wMapWidth] ld a, [wMapWidth]
add 6 add 3 * 2 ; surrounding tiles
add [hl] add [hl]
ld [hli], a ld [hli], a
ret nc ret nc
@ -195,14 +195,14 @@ UpdateOverworldMap:
cp -1 ; was 0 cp -1 ; was 0
jr nz, .done_up jr nz, .done_up
ld [hl], $1 ld [hl], $1
call .Sub6FromOverworldMapAnchor call .ScrollMapDataUp
.done_up .done_up
ret ret
.Sub6FromOverworldMapAnchor: .ScrollMapDataUp:
ld hl, wOverworldMapAnchor ld hl, wOverworldMapAnchor
ld a, [wMapWidth] ld a, [wMapWidth]
add 6 add 3 * 2 ; surrounding tiles
ld b, a ld b, a
ld a, [hl] ld a, [hl]
sub b sub b
@ -227,11 +227,11 @@ UpdateOverworldMap:
cp -1 cp -1
jr nz, .done_left jr nz, .done_left
ld [hl], 1 ld [hl], 1
call .DecrementwOverworldMapAnchor call .ScrollMapDataLeft
.done_left .done_left
ret ret
.DecrementwOverworldMapAnchor: .ScrollMapDataLeft:
ld hl, wOverworldMapAnchor ld hl, wOverworldMapAnchor
ld a, [hl] ld a, [hl]
sub 1 sub 1
@ -256,11 +256,11 @@ UpdateOverworldMap:
cp 2 cp 2
jr nz, .done_right jr nz, .done_right
ld [hl], 0 ld [hl], 0
call .IncrementwOverworldMapAnchor call .ScrollMapDataRight
.done_right .done_right
ret ret
.IncrementwOverworldMapAnchor: .ScrollMapDataRight:
ld hl, wOverworldMapAnchor ld hl, wOverworldMapAnchor
ld a, [hl] ld a, [hl]
add 1 add 1

8
home/map.asm
View File

@ -1151,7 +1151,7 @@ UnmaskObject::
ld [hl], 0 ; unmasked ld [hl], 0 ; unmasked
ret ret
ScrollMapDown:: ScrollMapUp::
hlcoord 0, 0 hlcoord 0, 0
ld de, wBGMapBuffer ld de, wBGMapBuffer
call BackupBGMapRow call BackupBGMapRow
@ -1166,7 +1166,7 @@ ScrollMapDown::
ldh [hBGMapUpdate], a ldh [hBGMapUpdate], a
ret ret
ScrollMapUp:: ScrollMapDown::
hlcoord 0, SCREEN_HEIGHT - 2 hlcoord 0, SCREEN_HEIGHT - 2
ld de, wBGMapBuffer ld de, wBGMapBuffer
call BackupBGMapRow call BackupBGMapRow
@ -1189,7 +1189,7 @@ ScrollMapUp::
ldh [hBGMapUpdate], a ldh [hBGMapUpdate], a
ret ret
ScrollMapRight:: ScrollMapLeft::
hlcoord 0, 0 hlcoord 0, 0
ld de, wBGMapBuffer ld de, wBGMapBuffer
call BackupBGMapColumn call BackupBGMapColumn
@ -1204,7 +1204,7 @@ ScrollMapRight::
ldh [hBGMapUpdate], a ldh [hBGMapUpdate], a
ret ret
ScrollMapLeft:: ScrollMapRight::
hlcoord SCREEN_WIDTH - 2, 0 hlcoord SCREEN_WIDTH - 2, 0
ld de, wBGMapBuffer ld de, wBGMapBuffer
call BackupBGMapColumn call BackupBGMapColumn