battle_controller_oak_old_man

include/battle_controllers.h

@@ -262,7 +262,7 @@ void SetControllerToSafari(void);
 // pokedude controller
 void SetControllerToPokeDude(void);
 
-// oak controller
+// oak and old man controller
 void SetControllerToOakOrOldMan(void);
 bool8 sub_80EB2E0(u8);
 void sub_80EB2F4(u8);
@@ -270,6 +270,8 @@ void sub_80E8570(void);
 void sub_80E85C0(void);
 void sub_80E8598(void);
 void sub_80E7988(void);
+void sub_80EB30C(void);
+void sub_80EB524(void);
 
 // link opponent
 void SetControllerToLinkOpponent(void);

include/constants/battle.h

@@ -44,38 +44,38 @@
 #define BIT_FLANK       2
 
 // Battle Type Flags
-#define BATTLE_TYPE_DOUBLE          0x0001
-#define BATTLE_TYPE_LINK            0x0002
-#define BATTLE_TYPE_IS_MASTER       0x0004 // In not-link battles, it's always set.
-#define BATTLE_TYPE_TRAINER         0x0008
-#define BATTLE_TYPE_FIRST_BATTLE    0x0010
-#define BATTLE_TYPE_20              0x0020
-#define BATTLE_TYPE_MULTI           0x0040
-#define BATTLE_TYPE_SAFARI          0x0080
-#define BATTLE_TYPE_BATTLE_TOWER    0x0100
+#define BATTLE_TYPE_DOUBLE           0x0001
+#define BATTLE_TYPE_LINK             0x0002
+#define BATTLE_TYPE_IS_MASTER        0x0004 // In not-link battles, it's always set.
+#define BATTLE_TYPE_TRAINER          0x0008
+#define BATTLE_TYPE_FIRST_BATTLE     0x0010
+#define BATTLE_TYPE_20               0x0020
+#define BATTLE_TYPE_MULTI            0x0040
+#define BATTLE_TYPE_SAFARI           0x0080
+#define BATTLE_TYPE_BATTLE_TOWER     0x0100
 #define BATTLE_TYPE_OLD_MAN_TUTORIAL 0x0200
-#define BATTLE_TYPE_ROAMER          0x0400
-#define BATTLE_TYPE_EREADER_TRAINER 0x0800
-#define BATTLE_TYPE_KYOGRE_GROUDON  0x1000 // TODO: used, rename later
-#define BATTLE_TYPE_LEGENDARY       0x2000
-#define BATTLE_TYPE_REGI            0x4000 // TODO: used, rename later
-#define BATTLE_TYPE_GHOST           0x8000
-#define BATTLE_TYPE_POKEDUDE        0x10000
-#define BATTLE_TYPE_PALACE          0x20000 // TODO: used, rename later
-#define BATTLE_TYPE_ARENA           0x40000 // TODO: used rename later
-#define BATTLE_TYPE_TRAINER_TOWER   0x80000
-#define BATTLE_TYPE_PIKE            0x100000
-#define BATTLE_TYPE_PYRAMID         0x200000
-#define BATTLE_TYPE_INGAME_PARTNER  0x400000
-#define BATTLE_TYPE_x800000         0x800000
-#define BATTLE_TYPE_RECORDED        0x1000000
-#define BATTLE_TYPE_x2000000        0x2000000
-#define BATTLE_TYPE_TRAINER_HILL    0x4000000
-#define BATTLE_TYPE_SECRET_BASE     0x8000000
-#define BATTLE_TYPE_GROUDON         0x10000000
-#define BATTLE_TYPE_KYOGRE          0x20000000
-#define BATTLE_TYPE_RAYQUAZA        0x40000000
-#define BATTLE_TYPE_x80000000       0x80000000
+#define BATTLE_TYPE_ROAMER           0x0400
+#define BATTLE_TYPE_EREADER_TRAINER  0x0800
+#define BATTLE_TYPE_KYOGRE_GROUDON   0x1000
+#define BATTLE_TYPE_LEGENDARY        0x2000
+#define BATTLE_TYPE_REGI             0x4000
+#define BATTLE_TYPE_GHOST            0x8000
+#define BATTLE_TYPE_POKEDUDE         0x10000
+#define BATTLE_TYPE_PALACE           0x20000
+#define BATTLE_TYPE_ARENA            0x40000
+#define BATTLE_TYPE_TRAINER_TOWER    0x80000
+#define BATTLE_TYPE_PIKE             0x100000
+#define BATTLE_TYPE_PYRAMID          0x200000
+#define BATTLE_TYPE_INGAME_PARTNER   0x400000
+#define BATTLE_TYPE_x800000          0x800000
+#define BATTLE_TYPE_RECORDED         0x1000000
+#define BATTLE_TYPE_x2000000         0x2000000
+#define BATTLE_TYPE_TRAINER_HILL     0x4000000
+#define BATTLE_TYPE_SECRET_BASE      0x8000000
+#define BATTLE_TYPE_GROUDON          0x10000000
+#define BATTLE_TYPE_KYOGRE           0x20000000
+#define BATTLE_TYPE_RAYQUAZA         0x40000000
+#define BATTLE_TYPE_x80000000        0x80000000
 #define BATTLE_TYPE_FRONTIER                (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID)
 #define BATTLE_TYPE_FRONTIER_NO_PYRAMID     (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE)
 

include/constants/battle_anim.h

@@ -377,6 +377,7 @@
 #define B_ANIM_SWITCH_OUT_PLAYER_MON    0x1
 #define B_ANIM_SWITCH_OUT_OPPONENT_MON  0x2
 #define B_ANIM_BALL_THROW               0x3
+#define B_ANIM_SP_4                     0x4 // this one is used in battle_controller_oak_old_man
 #define B_ANIM_SAFARI_BALL_THROW        0x4
 #define B_ANIM_SUBSTITUTE_TO_MON        0x5
 #define B_ANIM_MON_TO_SUBSTITUTE        0x6

include/strings.h

@@ -237,6 +237,7 @@ extern const u8 gUnknown_83FDD23[];
 extern const u8 gUnknown_83FDD64[];
 extern const u8 gUnknown_83FDDEB[];
 extern const u8 gUnknown_83FDCD2[];
+extern const u8 gUnknown_83FE6FA[];
 
 // credits
 extern const u8 gString_Dummy[];

ld_script.txt

@@ -209,7 +209,6 @@ SECTIONS {
         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);
         asm/battle_anim_special.o(.text);