diff options
| author | yenatch <yenatch@gmail.com> | 2015-11-28 20:15:35 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-11-28 20:15:35 -0500 |
| commit | 794410352fd92ccf06974763e4b3be0b807641ab (patch) | |
| tree | 05f5dd861966762db9556082229cee82e8b5eed9 /battle/anim_commands.asm | |
| parent | 9c5473e965520f672640daf4ee76622640e0de15 (diff) | |
| parent | 4bcd71e3227181baa536357af3d87a8d02af3890 (diff) | |
Merge pull request #328 from PikalaxALT/master
Split out most of main.asm
Diffstat (limited to 'battle/anim_commands.asm')
| -rw-r--r-- | battle/anim_commands.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index fed2c9236..ebc6a8a43 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -1172,7 +1172,7 @@ BattleAnimCmd_BeatUp: ; cc776 (33:4776) .done pop af ld [CurPartySpecies], a ; CurPartySpecies - ld b, $1 + ld b, SCGB_01 call GetSGBLayout pop af ld [rSVBK], a @@ -1437,13 +1437,13 @@ Functioncc91a: ; cc91a ld a, $5 ld [rSVBK], a ld hl, BGPals - ld de, wMapPals + ld de, UnknBGPals ld a, [rBGP] ld b, a ld c, $7 call CopyPals ld hl, OBPals - ld de, Unkn2Pals + ld de, UnknOBPals ld a, [rBGP] ld b, a ld c, $2 @@ -1465,7 +1465,7 @@ Functioncc94b: ; cc94b ld a, $5 ld [rSVBK], a ld hl, OBPals + $10 - ld de, Unkn2Pals + $10 + ld de, UnknOBPals + $10 ld a, [rOBP0] ld b, a ld c, $2 |