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

Miscellaneous fixes in the use of _command constants.

Browse Source
This commit is contained in:
mid-kid 2018-06-01 09:04:36 +02:00
parent 761edc7db3
commit 17087489c6
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/battle/effect_commands.asm
View File

@ -64,7 +64,7 @@ DoMove: ; 3402c
inc hl
ld [de], a
inc de
cp -1
cp endmove_command
jr nz, .GetMoveEffect
; Start at the first command.

6
engine/events/specials.asm
View File

@ -95,13 +95,13 @@ NameRival: ; 0xc29d
farcall _NamingScreen
; default to "SILVER"
ld hl, wRivalName
ld de, DefaultRivalName
ld de, .default
call InitName
ret
; 0xc2b2
DefaultRivalName: ; 0xc2b2
.default
db "SILVER@"
; 0xc2b9
NameRater: ; c2b9
farcall _NameRater

6
engine/gfx/pic_animation.asm
View File

@ -399,11 +399,11 @@ PokeAnim_DoAnimScript: ; d0250
.RunAnim: ; d0261
call PokeAnim_GetPointer
ld a, [wPokeAnimCommand]
cp -1
cp endanim_command
jr z, PokeAnim_End
cp -2
cp setrepeat_command
jr z, .SetRepeat
cp -3
cp dorepeat_command
jr z, .DoRepeat
call PokeAnim_GetFrame
ld a, [wPokeAnimParameter]

5
engine/overworld/map_objects.asm
View File

@ -2116,13 +2116,13 @@ SpawnEmote: ; 5547
ShakeGrass: ; 5556
push bc
ld de, .data_5562
ld de, .GrassObject
call CopyTempObjectData
call InitTempObject
pop bc
ret
.data_5562
.GrassObject
db $00, PAL_OW_TREE, SPRITEMOVEDATA_GRASS
; 5565
@ -2140,6 +2140,7 @@ ShakeScreen: ; 5565
.ScreenShakeObject:
db $00, PAL_OW_SILVER, SPRITEMOVEDATA_SCREENSHAKE
; 5579
DespawnEmote: ; 5579
push bc
ld a, [hMapObjectIndexBuffer]