remaining stuff of battle_script_commands

include/battle.h

@@ -9,6 +9,7 @@
 #include "battle_ai_switch_items.h"
 #include "battle_gfx_sfx_util.h"
 #include "battle_util2.h"
+#include "battle_bg.h"
 
 /*
     Banks are a name given to what could be called a 'battlerId' or 'monControllerId'.

include/battle_bg.h

@@ -0,0 +1,6 @@
+#ifndef GUARD_BATTLE_BG_H
+#define GUARD_BATTLE_BG_H
+
+void sub_800F34C(void);
+
+#endif // GUARD_BATTLE_BG_H

include/battle_controllers.h

@@ -77,6 +77,7 @@ enum
 #define BALL_3_SHAKES_FAIL      3
 #define BALL_3_SHAKES_SUCCESS   4
 #define BALL_TRAINER_BLOCK      5
+#define BALL_GHOST_DODGE        6
 
 #define RET_VALUE_LEVELLED_UP   11
 

include/battle_script_commands.h

@@ -34,19 +34,18 @@
 #define WINDOW_CLEAR            0x1
 #define WINDOW_x80              0x80
 
-void AI_CalcDmg(u8 bankAtk, u8 bankDef);
-u8 TypeCalc(u16 move, u8 bankAtk, u8 bankDef);
-u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility);
-u8 GetBattlerTurnOrderNum(u8 bank);
 void SetMoveEffect(bool8 primary, u8 certain);
-void BattleDestroyYesNoCursorAt(void);
+bool8 UproarWakeUpCheck(u8 battlerId);
-void BattleCreateYesNoCursorAt(void);
+u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility);
-void BufferMoveToLearnIntoBattleTextBuff2(void);
+u8 TypeCalc(u16 move, u8 attacker, u8 defender);
-void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags);
+void AI_CalcDmg(u8 attacker, u8 defender);
-bool8 UproarWakeUpCheck(u8 bank);
 bool32 IsMonGettingExpSentOut(void);
+void BattleCreateYesNoCursorAt(void);
+void BattleDestroyYesNoCursorAt(void);
+void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags);
+u8 GetBattlerTurnOrderNum(u8 battlerId);
+void BufferMoveToLearnIntoBattleTextBuff2(void);
 
 extern void (* const gBattleScriptingCommandsTable[])(void);
-extern const u8 gUnknown_0831C494[][4];
 
 #endif // GUARD_BATTLE_SCRIPT_COMMANDS_H

include/battle_scripts.h

@@ -225,5 +225,7 @@ extern const u8 BattleScript_IgnoresAndHitsItself[];
 extern const u8 BattleScript_MoveEffectRecoil[];
 extern const u8 BattleScript_FlushMessageBox[];
 extern const u8 BattleScript_SpikesOnFaintedBattler[];
+extern const u8 BattleScript_GhostBallDodge[];
+extern const u8 gUnknown_81D9A88[];
 
 #endif // GUARD_BATTLE_SCRIPTS_H

include/field_specials.h

@@ -13,5 +13,6 @@ void nullsub_61(void);
 u8 ContextNpcGetTextColor(void);
 void set_unknown_box_id(u8);
 u16 get_unknown_box_id(void);
+bool8 sub_80CC7B4(void);
 
 #endif // GUARD_FIELD_SPECIALS_H

include/overworld.h

@@ -119,5 +119,6 @@ bool8 is_light_level_8_or_9(u8 mapType);
 bool32 sub_8055C9C(void);
 void Overworld_ResetStateAfterDigEscRope(void);
 bool32 sub_8058244(void);
+u8 GetCurrentMapType(void);
 
 #endif //GUARD_ROM4_H

include/pokedex.h

@@ -45,4 +45,6 @@ u16 GetNationalPokedexCount(u8);
 u16 sub_80C0844(u8);
 u16 GetKantoPokedexCount(u8);
 
+u32 sub_8106B60(u16 species);
+
 #endif // GUARD_POKEDEX_H

include/trainer_pokemon_sprites.h

@@ -14,5 +14,6 @@ u8 sub_818D97C(u8 a0, u8 a1);
 u16 CreateTrainerPicSprite(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
 u16 FreeAndDestroyTrainerPicSprite(u16);
 u16 PlayerGenderToFrontTrainerPicId_Debug(u8 gender, bool8 getClass);
+u16 CreateMonPicSprite_HandleDeoxys(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
 
 #endif // GUARD_TRAINER_POKEMON_SPRITES_H

ld_script.txt

@@ -69,7 +69,6 @@ SECTIONS {
         asm/battle_2.o(.text);
         src/battle_util.o(.text);
         src/battle_script_commands.o(.text);
-        asm/battle_script_commands.o(.text);
         src/battle_util2.o(.text);
         src/battle_controller_player.o(.text);
         src/battle_gfx_sfx_util.o(.text);