From dd7e19107879f74d8f962a6a47d619470eaefbcd Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 16 Jul 2017 20:03:00 +0200
Subject: Battle4.C

Changed labels:
sub_801A02C = ItemBattleEffects
sub_8015150 = GetBattleBank
gUnknown_02024BEA = gRandomMove
BattleBufferB = gBattleBufferB
sub_8090D90 = GetNationalPokedexFlag
sub_80151D4 = PressurePPLose
ai_rate_move = AI_TypeCalc
sub_801B928 = IsPokeDisobedient
sub_801E3B4 = BankGetTurnOrder
sub_801E3EC = SetMoveEffect
sub_814A7FC = DestroyMenuCursor
sub_8010B88 = SwitchInClearStructs
sub_80325B8 = BattleMusicStop
sub_8017718 = CantUseMove
sub_8028350 = IsTwoTurnsMove
b_feature_update_destiny_bond = DestinyBondFlagUpdate
sub_801C108 = JumpIfMoveAffectedByProtect
move_weather_interaction = AttacksThisTurn
sub_8025E20 = ChangeStatBuffs
sub_8020B54 = MoveValuesCleanUp
---
 src/rom3.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/rom3.c')

diff --git a/src/rom3.c b/src/rom3.c
index 9d8d39f91..ad30bd4c8 100644
--- a/src/rom3.c
+++ b/src/rom3.c
@@ -580,7 +580,7 @@ void dp01_build_cmdbuf_x01_a_b_0(u8 a, u8 b, u8 c)
     dp01_prepare_buffer(a, gBattleBuffersTransferData, 4);
 }
 
-void EmitSetAttributes(u8 a, u8 b, u8 c, u8 d, u8 *e)
+void EmitSetAttributes(u8 a, u8 b, u8 c, u8 d, void *e)
 {
     int i;
 
@@ -588,7 +588,7 @@ void EmitSetAttributes(u8 a, u8 b, u8 c, u8 d, u8 *e)
     gBattleBuffersTransferData[1] = b;
     gBattleBuffersTransferData[2] = c;
     for (i = 0; i < d; i++)
-        gBattleBuffersTransferData[3 + i] = *(e++);
+        gBattleBuffersTransferData[3 + i] = *(u8*)(e++);
     dp01_prepare_buffer(a, gBattleBuffersTransferData, d + 3);
 }
 
@@ -613,7 +613,7 @@ void dp01_build_cmdbuf_x04_4_4_4(u8 a)
     dp01_prepare_buffer(a, gBattleBuffersTransferData, 4);
 }
 
-void sub_800C704(u8 a, u8 b, u8 c)
+void EmitSwitchInAnim(u8 a, u8 b, u8 c)
 {
     gBattleBuffersTransferData[0] = 5;
     gBattleBuffersTransferData[1] = b;
@@ -622,7 +622,7 @@ void sub_800C704(u8 a, u8 b, u8 c)
     dp01_prepare_buffer(a, gBattleBuffersTransferData, 4);
 }
 
-void dp01_build_cmdbuf_x06_a(u8 a, u8 b)
+void EmitReturnPokeToBall(u8 a, u8 b)
 {
     gBattleBuffersTransferData[0] = 6;
     gBattleBuffersTransferData[1] = b;
@@ -638,7 +638,7 @@ void dp01_build_cmdbuf_x07_7_7_7(u8 a)
     dp01_prepare_buffer(a, gBattleBuffersTransferData, 4);
 }
 
-void dp01_build_cmdbuf_x08_8_8_8(u8 a)
+void EmitTrainerSlide(u8 a)
 {
     gBattleBuffersTransferData[0] = 8;
     gBattleBuffersTransferData[1] = 8;
@@ -683,7 +683,7 @@ void dp01_build_cmdbuf_x0C_C_C_C(u8 a)
     dp01_prepare_buffer(a, gBattleBuffersTransferData, 4);
 }
 
-void dp01_build_cmdbuf_x0D_a(u8 a, u8 b)
+void EmitBallThrowAnim(u8 a, u8 b)
 {
     gBattleBuffersTransferData[0] = 13;
     gBattleBuffersTransferData[1] = b;
@@ -1058,7 +1058,7 @@ void sub_800CBE0(u8 a, u8 *b)
     dp01_prepare_buffer(a, gBattleBuffersTransferData, 4);
 }
 
-void dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f(u8 a, u8 b, u8 c, u8 d, u8 *e)
+void EmitChoosePokemon(u8 a, u8 b, u8 c, u8 d, u8 *e)
 {
     int i;
 
@@ -1282,7 +1282,7 @@ void EmitEffectivenessSound(u8 a, u16 b)
     dp01_prepare_buffer(a, gBattleBuffersTransferData, 4);
 }
 
-void sub_800D074(u8 a, u16 b)
+void EmitPlaySound(u8 a, u16 b)
 {
     gBattleBuffersTransferData[0] = 44;
     gBattleBuffersTransferData[1] = b;
-- 
cgit v1.2.3