Merge branch 'master' into decompile_evolution_scene

2 files changed, 39 insertions, 39 deletions

diff --git a/include/battle.h b/include/battle.h
index 08ed5cf58..72211f50f 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -689,13 +689,13 @@ extern u8 gBattleTextBuff1[];
 
 //function declarations of buffer emits
 void EmitGetAttributes(u8 buffID, u8 request, u8 c);    //0x0
-void dp01_build_cmdbuf_x01_a_b_0(u8 a, u8 b, u8 c); //0x1
+void Emitcmd1(u8 a, u8 b, u8 c); //0x1
 void EmitSetAttributes(u8 a, u8 request, u8 c, u8 bytes, void *data);  //0x2
-void EmitSwitchInAnim(u8 a, u8 b, u8 c); //0x5
+void EmitSendOutPoke(u8 a, u8 b, u8 c); //0x5
 void EmitReturnPokeToBall(u8 a, u8 b); //0x6
 void EmitTrainerSlide(u8 a); //0x8
-void EmitFaintAnimation(u8 a);  //0xA
-void EmitBallThrowAnim(u8 a, u8 shakes);  //0xD
+void Emitcmd10(u8 a);  //0xA
+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
@@ -707,15 +707,15 @@ void EmitStatusAnimation(u8 a, u8 b, u32 c); //0x1B
 void EmitStatusXor(u8 a, u8 b); //0x1C
 void EmitHitAnimation(u8 a); //0x29
 void EmitEffectivenessSound(u8 a, u16 sound); //0x2B
-void EmitPlaySound(u8 a, u16 sound);    //0x2C
+void Emitcmd44(u8 a, u16 sound);    //0x2C
 void EmitFaintingCry(u8 a); //0x2D
-void EmitBattleIntroSlide(u8 a, u8 b); //0x2E
-void dp01_build_cmdbuf_x30_TODO(u8 a, u8 *b, u8 c); //0x30
-void dp01_build_cmdbuf_x31_31_31_31(u8 a);  //0x31
+void EmitIntroSlide(u8 a, u8 b); //0x2E
+void Emitcmd48(u8 a, u8 *b, u8 c); //0x30
+void Emitcmd49(u8 a);  //0x31
 void EmitSpriteInvisibility(u8 a, u8 b); //0x33
 void EmitBattleAnimation(u8 a, u8 b, u16 c); //0x34
 void EmitResetActionMoveSelection(u8 a, u8 b); //0x36
-void dp01_build_cmdbuf_x37_a(u8 a, u8 b); //0x37
+void Emitcmd55(u8 a, u8 b); //0x37
 
 #define REQUEST_ALL_BATTLE      0x0
 #define REQUEST_SPECIES_BATTLE  0x1
diff --git a/include/rom3.h b/include/rom3.h
index 1fa55d11a..95ef5cca4 100644
--- a/include/rom3.h
+++ b/include/rom3.h
@@ -15,53 +15,53 @@ void sub_800C1A8(u8);
 void sub_800C35C(void);
 void sub_800C47C(u8);
 void EmitGetAttributes(u8 a, u8 b, u8 c);
-void dp01_build_cmdbuf_x01_a_b_0(u8 a, u8 b, u8 c);
-void dp01_build_cmdbuf_x04_4_4_4(u8 a);
-void EmitSwitchInAnim(u8, u8, u8);
+void Emitcmd1(u8 a, u8 b, u8 c);
+void EmitLoadPokeSprite(u8 a);
+void EmitSendOutPoke(u8, u8, u8);
 void EmitReturnPokeToBall(u8 a, u8 b);
-void dp01_build_cmdbuf_x07_7_7_7(u8 a);
+void EmitTrainerThrow(u8 a);
 void EmitTrainerSlide(u8 a);
-void dp01_build_cmdbuf_x09_9_9_9(u8 a);
-void EmitFaintAnimation(u8 a);
-void dp01_build_cmdbuf_x0B_B_B_B(u8 a);
-void dp01_build_cmdbuf_x0C_C_C_C(u8 a);
-void EmitBallThrowAnim(u8 a, u8 b);
+void EmitTrainerSlideBack(u8 a);
+void Emitcmd10(u8 a);
+void Emitcmd11(u8 a);
+void Emitcmd12(u8 a);
+void EmitBallThrow(u8 a, u8 b);
 void EmitMoveAnimation(u8 a, u16 b, u8 c, u16 d, s32 e, u8 f, struct DisableStruct *g);
 void EmitPrintString(u8 a, u16 b);
 void EmitPrintStringPlayerOnly(u8 a, u16 stringID);
-void dp01_build_cmdbuf_x12_a_bb(u8 a, u8 b, u16 c);
-void sub_800CBA4(u8 a, u8 b, u8 c, u8 *d);
-void sub_800CBE0(u8 a, u8 *b);
+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 EmitChoosePokemon(u8 a, u8 b, u8 c, u8 d, u8 *e);
-void dp01_build_cmdbuf_x17_17_17_17(u8 a);
+void Emitcmd23(u8 a);
 void EmitHealthBarUpdate(u8 a, u16 b);
 void EmitExpBarUpdate(u8 a, u8 b, u16 c);
 void EmitStatusIconUpdate(u8 a, u32 b, u32 c);
 void EmitStatusAnimation(u8 a, u8 b, u32 c);
 void EmitStatusXor(u8 a, u8 b);
-void dp01_build_cmdbuf_x1D_1D_numargs_varargs(u8, u16, u8 *);
-void dp01_build_cmdbuf_x21_a_bb(u8 a, u8 b, u16 c);
-void dp01_build_cmdbuf_x22_a_three_bytes(u8 a, u8 b, u8 *c);
-void dp01_build_cmdbuf_x23_aa_0(u8 a, u16 b);
-void dp01_build_cmdbuf_x24_aa_0(u8 a, u16 b);
-void dp01_build_cmdbuf_x25_25_25_25(u8 a);
-void dp01_build_cmdbuf_x26_a(u8 a, u8 b);
-void dp01_build_cmdbuf_x27_27_27_27(u8 a);
-void dp01_build_cmdbuf_x28_28_28_28(u8 a);
+void Emitcmd29(u8, u16, u8 *);
+void Emitcmd33(u8 a, u8 b, u16 c);
+void Emitcmd34(u8 a, u8 b, u8 *c);
+void Emitcmd35(u8 a, u16 b);
+void Emitcmd36(u8 a, u16 b);
+void Emitcmd37(u8 a);
+void Emitcmd38(u8 a, u8 b);
+void Emitcmd39(u8 a);
+void Emitcmd40(u8 a);
 void EmitHitAnimation(u8 a);
-void dp01_build_cmdbuf_x2A_2A_2A_2A(u8 a);
+void Emitcmd42(u8 a);
 void EmitEffectivenessSound(u8 a, u16 b);
-void EmitPlaySound(u8 a, u16 b);
+void Emitcmd44(u8 a, u16 b);
 void EmitFaintingCry(u8 a);
-void EmitBattleIntroSlide(u8 a, u8 b);
-void dp01_build_cmdbuf_x2F_2F_2F_2F(u8 a);
-void dp01_build_cmdbuf_x30_TODO(u8 a, u8 *b, u8 c);
-void dp01_build_cmdbuf_x31_31_31_31(u8 a);
-void dp01_build_cmdbuf_x32_32_32_32(u8 a);
+void EmitIntroSlide(u8 a, u8 b);
+void EmitTrainerBallThrow(u8 a);
+void Emitcmd48(u8 a, u8 *b, u8 c);
+void Emitcmd49(u8 a);
+void Emitcmd50(u8 a);
 void EmitSpriteInvisibility(u8 a, u8 b);
 void EmitBattleAnimation(u8 a, u8 b, u16 c);
 void EmitLinkStandbyMsg(u8 a, u8 b);
 void EmitResetActionMoveSelection(u8 a, u8 b);
-void dp01_build_cmdbuf_x37_a(u8 a, u8 b);
+void Emitcmd55(u8 a, u8 b);
 
 #endif // GUARD_ROM3_H