diff options
| -rw-r--r-- | asm/battle_2.s | 6 | ||||
| -rw-r--r-- | include/battle.h | 2 | ||||
| -rw-r--r-- | include/rom3.h | 2 | ||||
| -rw-r--r-- | src/battle_4.c | 4 | ||||
| -rw-r--r-- | src/rom3.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/asm/battle_2.s b/asm/battle_2.s index 731759851..617729451 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -573,7 +573,7 @@ _080127E0: str r0, [sp] movs r0, 0 movs r2, 0x6 - bl Emitcmd22 + bl EmitChoosePokemon b _0801289E .align 2, 0 _08012808: .4byte gActiveBank @@ -624,7 +624,7 @@ _08012854: movs r1, 0 _0801286C: movs r3, 0 - bl Emitcmd22 + bl EmitChoosePokemon b _0801289E .align 2, 0 _08012874: .4byte gActionForBanks @@ -643,7 +643,7 @@ _08012884: movs r1, 0 movs r2, 0x6 movs r3, 0 - bl Emitcmd22 + bl EmitChoosePokemon _0801289E: ldr r0, _080128A8 @ =gActiveBank ldrb r0, [r0] diff --git a/include/battle.h b/include/battle.h index 255e6d0e5..72211f50f 100644 --- a/include/battle.h +++ b/include/battle.h @@ -699,7 +699,7 @@ void EmitBallThrow(u8 a, u8 shakes); //0xD //void EmitMoveAnimation(u8 a, u16 move, u8 turn, u16 power, s32 dmg, u8 happiness, void *disable_struct); //0xF void EmitPrintString(u8 a, u16 stringID); //0x10 //void EmitPrintStringPlayerOnly(u8 a, u16 stringID); //0x11 -void Emitcmd22(u8 a, u8 b, u8 c, u8 d, u8 *e); //0x16 +void EmitChoosePokemon(u8 a, u8 b, u8 c, u8 d, u8 *e); //0x16 //void EmitHealthBarUpdate(u8 a, u16 b); //0x18; Had to declare the second arg as u16 because s16 wont match in atk0b //void EmitExpBarUpdate(u8 a, u8 b, u16 c); //0x19 void EmitStatusIconUpdate(u8 a, u32 b, u32 c); //0x1A diff --git a/include/rom3.h b/include/rom3.h index fb07f045f..95ef5cca4 100644 --- a/include/rom3.h +++ b/include/rom3.h @@ -32,7 +32,7 @@ void EmitPrintStringPlayerOnly(u8 a, u16 stringID); void Emitcmd18(u8 a, u8 b, u16 c); void Emitcmd20(u8 a, u8 b, u8 c, u8 *d); void EmitOpenBag(u8 a, u8 *b); -void Emitcmd22(u8 a, u8 b, u8 c, u8 d, u8 *e); +void EmitChoosePokemon(u8 a, u8 b, u8 c, u8 d, u8 *e); void Emitcmd23(u8 a); void EmitHealthBarUpdate(u8 a, u16 b); void EmitExpBarUpdate(u8 a, u8 b, u16 c); 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; |