diff options
author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2020-12-16 14:51:21 -0500 |
---|---|---|
committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2020-12-16 14:51:21 -0500 |
commit | 34fc9789c9d11464161aabf022eb270597c6778a (patch) | |
tree | d7f97e29db99b3983d2d50678dcc250da179d32d /src/use_pokeblock.c | |
parent | cc5db41f30708c1cc2d33a46879c96a9404764a3 (diff) | |
parent | 49bdaeb940afc98e3f98b24c9a5afe1bb8d5d86b (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into rebase-install-md
Diffstat (limited to 'src/use_pokeblock.c')
-rw-r--r-- | src/use_pokeblock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 1af157b90..b4ccbfe06 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -1,5 +1,6 @@ #include "global.h" #include "main.h" +#include "dma3.h" #include "pokeblock.h" #include "malloc.h" #include "decompress.h" @@ -1240,8 +1241,7 @@ static void UpdateMonPic(u8 loadId) } else { - do {} while(0); // Only needed to match, feel free to remove. - DmaCopy16Defvars(3, sMenu->partySheets[loadId], sMenu->curMonTileStart, 0x800); + Dma3CopyLarge16_(sMenu->partySheets[loadId], sMenu->curMonTileStart, 0x800); LoadPalette(sMenu->partyPalettes[loadId], sMenu->curMonPalette, 32); } } |