thru OakOldManHandleSwitchInAnim

data/data_83FECCC.s

@@ -137,9 +137,6 @@ gUnknown_84020DA:: @ 84020DA
 gUnknown_84020E6:: @ 84020E6
 	.incbin "baserom.gba", 0x4020E6, 0x12
 
-sOakOldManBufferCommands:: @ 84020F8
-	.incbin "baserom.gba", 0x4020F8, 0xE4
-
 	.section .rodata.battle_anim_special
 
 gUnknown_840BF3C:: @ 840BF3C

include/battle.h

@@ -510,7 +510,9 @@ struct BattleStruct
     u8 expGetterBattlerId;
     u8 field_90;
     u8 field_91;
-    u8 AI_monToSwitchIntoId[MAX_BATTLERS_COUNT];
+    u8 AI_monToSwitchIntoId[2];
+    u8 field_94;
+    u8 field_95;
     u8 field_96;
     u8 field_97;
     u8 lastTakenMove[MAX_BATTLERS_COUNT * 2 * 2]; // ask gamefreak why they declared it that way

include/battle_anim.h

@@ -167,6 +167,8 @@ void LaunchStatusAnimation(u8 bank, u8 statusAnimId);
 u8 ItemIdToBallId(u16 itemId);
 u8 LaunchBallStarsTask(u8 x, u8 y, u8 kindOfStars, u8 arg3, u8 ballId);
 u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 arg2, u8 ballId);
+void sub_80EEFC8(u8 *, u8 *, u8 battlerId);
+void sub_80EF0E0(u8 batterId);
 
 // battle_anim_mons.c
 extern const struct MonCoords gCastformFrontSpriteCoords[];

include/item.h

@@ -37,7 +37,6 @@ void CopyItemNameHandlePlural(u16 itemId, u8 *string, u32 quantity);
 bool8 IsBagPocketNonEmpty(u8 pocket);
 bool8 CheckBagHasItem(u16 itemId, u16 count);
 bool8 CheckBagHasSpace(u16 itemId, u16 count);
-bool8 AddBagItem(u16 itemId, u16 count);
 bool8 RemoveBagItem(u16 itemId, u16 count);
 u8 GetPocketByItemId(u16 itemId);
 void ClearItemSlots(struct ItemSlot *itemSlots, u8 b);

include/item_menu.h

@@ -36,6 +36,7 @@ void ItemMenu_SetExitCallback(void (*)(void));
 void DisplayItemMessageInBag(u8 taskId, u8 bgId, const u8 * string, TaskFunc followUpFunc);
 void sub_810A1F8(u8 taskId);
 void sub_8107ECC(void);
+void sub_810AF74(void);
 void sub_8108DC8(u8 pocketId);
 void sub_81089F4(u8 pocketId);
 void sub_8107DB4(u8 menuType, u8 pocket, MainCallback callback);

include/strings.h

@@ -227,6 +227,17 @@ extern const u8 gText_WhatWillPkmnDo[];
 // battle_script_commands
 extern const u8 gText_BattleYesNoChoice[];
 
+// battle_controller_oak_old_man
+extern const u8 gUnknown_83FDAE2[];
+extern const u8 gUnknown_83FDB92[];
+extern const u8 gUnknown_83FDBEF[];
+extern const u8 gUnknown_83FDC58[];
+extern const u8 gUnknown_83FDC95[];
+extern const u8 gUnknown_83FDD23[];
+extern const u8 gUnknown_83FDD64[];
+extern const u8 gUnknown_83FDDEB[];
+extern const u8 gUnknown_83FDCD2[];
+
 // credits
 extern const u8 gString_Dummy[];
 extern const u8 gString_PokemonFireRed_Staff[]; // FR

ld_script.txt

@@ -208,6 +208,7 @@ SECTIONS {
         asm/learn_move.o(.text);
         src/fldeff_softboiled.o(.text);
         asm/battle_tower.o(.text);
+        src/battle_controller_oak_old_man.o(.text);
         asm/battle_controller_oak.o(.text);
         src/player_pc.o(.text);
         src/intro.o(.text);
@@ -457,6 +458,7 @@ SECTIONS {
         data/data_83FECCC.o(.rodata);
         src/battle_controller_safari.o(.rodata);
         data/data_83FECCC.o(.rodata.83FEDE4);
+        src/battle_controller_oak_old_man.o(.rodata);
         src/player_pc.o(.rodata);
         src/intro.o(.rodata);
         data/data_83FECCC.o(.rodata.battle_anim_special);

src/battle_controller_opponent.c

@@ -45,7 +45,7 @@ static void OpponentHandleTrainerSlideBack(void);
 static void OpponentHandleFaintAnimation(void);
 static void OpponentHandlePaletteFade(void);
 static void OpponentHandleSuccessBallThrowAnim(void);
-static void OpponentHandleBallThrow(void);
+static void OpponentHandleBallThrowAnim(void);
 static void OpponentHandlePause(void);
 static void OpponentHandleMoveAnimation(void);
 static void OpponentHandlePrintString(void);
@@ -116,7 +116,7 @@ static void (*const sOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
     OpponentHandleFaintAnimation,
     OpponentHandlePaletteFade,
     OpponentHandleSuccessBallThrowAnim,
-    OpponentHandleBallThrow,
+    OpponentHandleBallThrowAnim,
     OpponentHandlePause,
     OpponentHandleMoveAnimation,
     OpponentHandlePrintString,
@@ -1231,7 +1231,7 @@ static void OpponentHandleSuccessBallThrowAnim(void)
     OpponentBufferExecCompleted();
 }
 
-static void OpponentHandleBallThrow(void)
+static void OpponentHandleBallThrowAnim(void)
 {
     OpponentBufferExecCompleted();
 }

src/battle_controller_player.c

@@ -839,7 +839,7 @@ void sub_802F6A8(void)
         else
         {
             m4aSongNumStop(SE_HINSI);
-            gMain.inBattle = 0;
+            gMain.inBattle = FALSE;
             gMain.callback1 = gPreBattleCallback1;
             SetMainCallback2(gMain.savedCallback);
         }
@@ -1318,7 +1318,6 @@ static void WaitForMonSelection(void)
             BtlController_EmitChosenMonReturnValue(1, gUnknown_203B0C1, gUnknown_203B0DC);
         else
             BtlController_EmitChosenMonReturnValue(1, 6, NULL);
-
         if ((gBattleBufferA[gActiveBattler][1] & 0xF) == 1)
             PrintLinkStandbyMsg();
         PlayerBufferExecCompleted();