diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-08-18 10:32:50 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-08-18 10:32:50 -0500 |
| commit | 1a987d1e1ab96ca9553d4253c72858057332a03a (patch) | |
| tree | d101dc054e112304f327a5359532ee972e8da81a /engine/battle/animations.asm | |
| parent | More joypad constants (diff) | |
| parent | item name length constant (diff) | |
| download | pokeyellow-1a987d1e1ab96ca9553d4253c72858057332a03a.tar.gz pokeyellow-1a987d1e1ab96ca9553d4253c72858057332a03a.tar.xz pokeyellow-1a987d1e1ab96ca9553d4253c72858057332a03a.zip | |
Merge pull request #114 from YamaArashi/master
Commented SGB palettes and other things
Diffstat (limited to 'engine/battle/animations.asm')
| -rwxr-xr-x | engine/battle/animations.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 1bd48988..6d0f0e5f 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -2170,8 +2170,8 @@ ChangeMonPic: ; 79793 (1e:5793) pop af ld [wBattleMonSpecies2], a .done - ld b, $1 - jp GoPAL_SET + ld b, SET_PAL_BATTLE + jp RunPaletteCommand AnimationHideEnemyMonPic: ; 797d8 (1e:57d8) ; Hides the enemy mon's sprite |