diff options
| author | yenatch <yenatch@gmail.com> | 2018-06-05 07:04:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-05 07:04:54 -0400 |
| commit | dbf05e48ebe2cd841a3d710f5bc9f24db2f068a0 (patch) | |
| tree | 2b05ffe9e84a2c6212da18169141cfaa1ed40dd4 /engine | |
| parent | c61d6a3a5a602d5594071e9446bb3d93b5d99a75 (diff) | |
| parent | 6f4e968b7038a2478c6bcf98b71aa81ed9d21f6a (diff) | |
Merge pull request #517 from mid-kid/master
Some fixes all around
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/effect_commands.asm | 2 | ||||
| -rw-r--r-- | engine/events/specials.asm | 6 | ||||
| -rw-r--r-- | engine/gfx/pic_animation.asm | 6 | ||||
| -rw-r--r-- | engine/overworld/map_objects.asm | 5 |
4 files changed, 10 insertions, 9 deletions
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 5fd37e054..2723bba6b 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -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. diff --git a/engine/events/specials.asm b/engine/events/specials.asm index acfc3c450..533f59520 100644 --- a/engine/events/specials.asm +++ b/engine/events/specials.asm @@ -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 diff --git a/engine/gfx/pic_animation.asm b/engine/gfx/pic_animation.asm index 54999a6bb..925296388 100644 --- a/engine/gfx/pic_animation.asm +++ b/engine/gfx/pic_animation.asm @@ -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] diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 6652beead..7ed1d5f5f 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -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] |