diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-07 23:53:43 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-07 23:53:43 -0500 |
| commit | 79c64d2b7137f12cccf290ea7f495727ad6b4cca (patch) | |
| tree | b2022ddfbc867bab3802465afbbdc7c3843460a9 /src/rom3.c | |
| parent | fd42bcc78ce229d13afc26af4c6d2dd0187b871d (diff) | |
| parent | 6b38db228befa044a2cfe31ed78555e3f0bd3935 (diff) | |
Merge branch 'master' into pokemon_storage_system
Diffstat (limited to 'src/rom3.c')
| -rw-r--r-- | src/rom3.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rom3.c b/src/rom3.c index cdc66989c..11239a681 100644 --- a/src/rom3.c +++ b/src/rom3.c @@ -5,6 +5,7 @@ #include "battle_anim.h" #include "battle_anim_81258BC.h" #include "battle_anim_8137220.h" +#include "battle_util.h" #include "cable_club.h" #include "constants/items.h" #include "link.h" @@ -582,7 +583,7 @@ void Emitcmd1(u8 a, u8 b, u8 c) PrepareBufferDataTransfer(a, gBattleBuffersTransferData, 4); } -void EmitSetAttributes(u8 a, u8 b, u8 c, u8 d, void *e) +void EmitSetMonData(u8 a, u8 b, u8 c, u8 d, void *e) { int i; |