summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-08-27 11:14:39 -0500
committercamthesaxman <cameronghall@cox.net>2017-08-27 11:14:39 -0500
commit2f7e3b3f6bfa62d60adb6f24f8a59f93987dca3d (patch)
tree058dcbe19b2b7c90b412995082b0b6057a115871 /src
parent9202e8d4c0b8ae285d0dae4ead2582c04c5d100f (diff)
Emitcmd22 -> EmitChoosePokemon
Diffstat (limited to 'src')
-rw-r--r--src/battle_4.c4
-rw-r--r--src/rom3.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_4.c b/src/battle_4.c
index a3cfbc2de..a796ace94 100644
--- a/src/battle_4.c
+++ b/src/battle_4.c
@@ -10205,7 +10205,7 @@ void sub_8022A3C(u8 unkown)
{
//BATTLE_STRUCT->unk16064[gActiveBank] = gBattlePartyID[gActiveBank];
ewram[gActiveBank + 0x16064] = gBattlePartyID[gActiveBank];
- Emitcmd22(0, 1, unkown, 0, BATTLE_STRUCT->unk1606C[gActiveBank]);
+ EmitChoosePokemon(0, 1, unkown, 0, BATTLE_STRUCT->unk1606C[gActiveBank]);
MarkBufferBankForExecution(gActiveBank);
}
@@ -11173,7 +11173,7 @@ _080231F8:\n\
movs r0, 0\n\
adds r1, r5, 0\n\
movs r3, 0\n\
- bl Emitcmd22\n\
+ bl EmitChoosePokemon\n\
ldrb r0, [r4]\n\
bl MarkBufferBankForExecution\n\
ldr r0, [r6]\n\
diff --git a/src/rom3.c b/src/rom3.c
index e9e664069..da2ea1357 100644
--- a/src/rom3.c
+++ b/src/rom3.c
@@ -1060,7 +1060,7 @@ void EmitOpenBag(u8 a, u8 *b)
dp01_prepare_buffer(a, gBattleBuffersTransferData, 4);
}
-void Emitcmd22(u8 a, u8 b, u8 c, u8 d, u8 *e)
+void EmitChoosePokemon(u8 a, u8 b, u8 c, u8 d, u8 *e)
{
int i;