pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #579 from Rangi42/master

Browse Source 
Miscellaneous
This commit is contained in:
Rangi 2018-12-16 14:19:06 -05:00 committed by GitHub
commit 83ff516c82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/engine.asm
View File

@ -1138,7 +1138,7 @@ ParseMusic:
call GetMusicByte ; store next byte in a call GetMusicByte ; store next byte in a
cp endchannel_cmd cp endchannel_cmd
jr z, .endchannel jr z, .endchannel
cp first_music_cmd cp FIRST_MUSIC_CMD
jr c, .readnote jr c, .readnote
; then it's a command ; then it's a command
.readcommand .readcommand
@ -1350,7 +1350,7 @@ ParseMusicCommand:
; reload command ; reload command
ld a, [wCurMusicByte] ld a, [wCurMusicByte]
; get command # ; get command #
sub first_music_cmd sub FIRST_MUSIC_CMD
ld e, a ld e, a
ld d, 0 ld d, 0
; seek command pointer ; seek command pointer

1
engine/overworld/map_objects.asm
View File

@ -1822,6 +1822,7 @@ UpdateJumpPosition:
.y .y
db -4, -6, -8, -10, -11, -12, -12, -12 db -4, -6, -8, -10, -11, -12, -12, -12
db -11, -10, -9, -8, -6, -4, 0, 0 db -11, -10, -9, -8, -6, -4, 0, 0
Function5000: ; unscripted? Function5000: ; unscripted?
; copy [wPlayerNextMovement] to [wPlayerMovement] ; copy [wPlayerNextMovement] to [wPlayerMovement]
ld a, [wPlayerNextMovement] ld a, [wPlayerNextMovement]

9
engine/overworld/player_movement.asm
View File

@ -469,6 +469,7 @@ DoPlayerMovement::
ret ret
.Steps: .Steps:
; entries correspond to STEP_* constants
dw .SlowStep dw .SlowStep
dw .NormalStep dw .NormalStep
dw .FastStep dw .FastStep
@ -514,10 +515,10 @@ DoPlayerMovement::
turn_step LEFT turn_step LEFT
turn_step RIGHT turn_step RIGHT
.FinishFacing: .FinishFacing:
db $80 + DOWN db $80 | DOWN
db $80 + UP db $80 | UP
db $80 + LEFT db $80 | LEFT
db $80 + RIGHT db $80 | RIGHT
.StandInPlace: .StandInPlace:
ld a, 0 ld a, 0

13
macros/scripts/audio.asm
View File

@ -20,20 +20,23 @@ noise: MACRO
ENDM ENDM
; MusicCommands indexes (see audio/engine.asm) ; MusicCommands indexes (see audio/engine.asm)
enum_start $d8 enum_start $d0, +8
first_music_cmd EQU __enum__ + -8 FIRST_MUSIC_CMD EQU __enum__
enum octave_cmd ; $d0
octave: MACRO octave: MACRO
db first_music_cmd + 8 - (\1) db octave_cmd | 8 - (\1)
ENDM ENDM
__enumdir__ = +1
enum notetype_cmd ; $d8 enum notetype_cmd ; $d8
notetype: MACRO notetype: MACRO
db notetype_cmd db notetype_cmd
db \1 ; note_length db \1 ; note_length
if _NARG >= 2 if _NARG >= 2
db \2 ; intensity db \2 ; intensity
endc endc
ENDM ENDM
enum pitchoffset_cmd ; $d9 enum pitchoffset_cmd ; $d9