Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prefix wram labels with w, part 2.

Browse Source
This commit is contained in:
luckytyphlosion
2018-01-23 17:39:09 -05:00
parent 79bd48f85c
commit a1951cefc0
323 changed files with 8581 additions and 8581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
engine/map_setup.asm
View File

@@ -172,12 +172,12 @@ CheckReplaceKrisSprite: ; 154f7
bit 1, [hl]
ret z
ld a, PLAYER_BIKE
ld [PlayerState], a
ld [wPlayerState], a
scf
ret
.CheckSurfing2: ; 1551a (5:551a)
ld a, [PlayerState]
ld a, [wPlayerState]
cp PLAYER_NORMAL
jr z, .nope
cp PLAYER_SKATE
@@ -195,12 +195,12 @@ CheckReplaceKrisSprite: ; 154f7
jr z, .checkbiking
jr .nope
.checkbiking
ld a, [PlayerState]
ld a, [wPlayerState]
cp PLAYER_BIKE
jr nz, .nope
.surfing
ld a, PLAYER_NORMAL
ld [PlayerState], a
ld [wPlayerState], a
scf
ret
@@ -211,13 +211,13 @@ CheckReplaceKrisSprite: ; 154f7
.CheckSurfing: ; 1554e (5:554e)
call CheckOnWater
jr nz, .ret_nc
ld a, [PlayerState]
ld a, [wPlayerState]
cp PLAYER_SURF
jr z, ._surfing
cp PLAYER_SURF_PIKA
jr z, ._surfing
ld a, PLAYER_SURF
ld [PlayerState], a
ld [wPlayerState], a
._surfing
scf
ret
@@ -238,22 +238,22 @@ RetainOldPalettes: ; 1556d
RotatePalettesRightMapAndMusic: ; 15574
ld e, 0
ld a, [MusicFadeID]
ld a, [wMusicFadeID]
ld d, 0
ld a, [MusicFadeID + 1]
ld a, [wMusicFadeID + 1]
ld a, $4
ld [MusicFade], a
ld [wMusicFade], a
call RotateThreePalettesRight
ret
; 15587
ForceMapMusic: ; 15587
ld a, [PlayerState]
ld a, [wPlayerState]
cp PLAYER_BIKE
jr nz, .notbiking
call VolumeOff
ld a, $88
ld [MusicFade], a
ld [wMusicFade], a
.notbiking
call TryRestartMapMusic
ret