From d35cf06854be09a6bcf5ceb63cdb54cefd6d48a2 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 21 Jan 2018 18:25:23 -0500
Subject: nonmatching sub_801120C

---
 src/battle_script_commands.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/battle_script_commands.c')

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index c7976fc2a..b7e493122 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -3713,7 +3713,7 @@ static void atk24(void)
     }
 }
 #else
-__attribute__((naked))
+ASM_DIRECT
 static void atk24(void)
 {
     asm("\n\
@@ -4593,7 +4593,7 @@ static void atk48_playstatchangeanimation(void)
     }
 }
 #else
-__attribute__((naked))
+ASM_DIRECT
 static void atk48_playstatchangeanimation(void)
 {
     asm("\n\
@@ -9486,7 +9486,7 @@ static void atkC1_hiddenpowercalc(void)
 }
 
 #else
-__attribute__((naked))
+ASM_DIRECT
 static void atkC1_hiddenpowercalc(void)
 {
     asm(".syntax unified\n\
-- 
cgit v1.2.3


From 1a1bad312972217a7ef390df469b8cf763626a66 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Fri, 9 Feb 2018 18:46:00 +0100
Subject: decompile pokemon_item_effect

---
 src/battle_script_commands.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/battle_script_commands.c')

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index fab1c18bb..2acdd02f6 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -6940,7 +6940,7 @@ static void atk74_hpthresholds2(void)
 static void atk75_useitemonopponent(void)
 {
     gBankInMenu = gBattlerAttacker;
-    ExecuteTableBasedItemEffect(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker]], gLastUsedItem, gBattlerPartyIndexes[gBattlerAttacker], 0, 1);
+    PokemonUseItemEffects(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker]], gLastUsedItem, gBattlerPartyIndexes[gBattlerAttacker], 0, 1);
 
     gBattlescriptCurrInstr += 1;
 }
-- 
cgit v1.2.3


From 084ba7a7a47af9744acd7d9bdf7abffb10fba87d Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 10 Feb 2018 13:24:03 +0100
Subject: decompile all pokemon files

---
 src/battle_script_commands.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/battle_script_commands.c')

diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 2acdd02f6..2ccc8fea8 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -11,7 +11,6 @@
 #include "constants/hold_effects.h"
 #include "util.h"
 #include "pokemon.h"
-#include "calculate_base_damage.h"
 #include "random.h"
 #include "battle_controllers.h"
 #include "battle_interface.h"
@@ -31,7 +30,6 @@
 #include "bg.h"
 #include "string_util.h"
 #include "pokemon_icon.h"
-#include "pokemon_item_effects.h"
 #include "m4a.h"
 #include "mail.h"
 #include "event_data.h"
-- 
cgit v1.2.3