diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-03 16:45:53 -0700 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-03 16:45:53 -0700 |
commit | 4df728666e55b47480467fbea86f48dadcb81c97 (patch) | |
tree | 6a8413c90ec9d68c54389e1a54f6de9f12bb686c /src/battle/battle_interface.c | |
parent | 9b2ebe671fe77298d0b1adcb5d87cbb2bd01cd3e (diff) | |
parent | 397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff) |
Merge branch 'master' into slot_machine
Diffstat (limited to 'src/battle/battle_interface.c')
-rw-r--r-- | src/battle/battle_interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c index ea393277e..97568d254 100644 --- a/src/battle/battle_interface.c +++ b/src/battle/battle_interface.c @@ -583,7 +583,7 @@ void nullsub_11() { } -void sub_8043EB4(u8 priority) +void UpdateOamPriorityInAllHealthboxes(u8 priority) { s32 i; |