diff options
| author | yenatch <yenatch@gmail.com> | 2016-04-18 08:01:12 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-04-18 08:01:12 -0400 |
| commit | 7aef59841489ea449b9a34d424c681a4b48b88ab (patch) | |
| tree | 72d46f1cc076564f62b11f5379960cd745a7fc9a /predef/cgb.asm | |
| parent | c5fb2c947ffcdd0ddd80319a24a6acbe828d9598 (diff) | |
| parent | 5d94fb22ed0e4c9edfca506b80f50ef71fd78664 (diff) | |
Merge pull request #338 from PikalaxALT/master
Battle anims, HP Bar anim
Diffstat (limited to 'predef/cgb.asm')
| -rw-r--r-- | predef/cgb.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/predef/cgb.asm b/predef/cgb.asm index e945c4062..addbcb0d5 100644 --- a/predef/cgb.asm +++ b/predef/cgb.asm @@ -32,7 +32,7 @@ Predef_LoadSGBLayoutCGB: ; 8d59 ret ; 8d7a -.dw: ; 8d7a +.dw ; 8d7a dw _CGB_BattleGrayscale dw _CGB_BattleColors dw _CGB_PokegearPals @@ -341,11 +341,11 @@ _CGB17: ; 8fca call LoadHLPaletteIntoDE jr .Resume -.GetMonPalette +.GetMonPalette: ld bc, TempMonDVs call GetPlayerOrMonPalettePointer call LoadPalette_White_Col1_Col2_Black -.Resume +.Resume: call WipeAttrMap hlcoord 1, 4, AttrMap lb bc, 7, 7 |